diff options
author | Luke Kanies <luke@madstop.com> | 2009-08-01 23:24:54 -0700 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-08-02 16:38:49 +1000 |
commit | 54a225dd26d867d5672df48a5bc0ed858821bf40 (patch) | |
tree | de489ee258993c812ad7cbc803fb9657721b6d1c /test | |
parent | 1ce31b4f5c5a38aa6914a5367ea6dd8db53174ab (diff) | |
download | puppet-54a225dd26d867d5672df48a5bc0ed858821bf40.tar.gz puppet-54a225dd26d867d5672df48a5bc0ed858821bf40.tar.xz puppet-54a225dd26d867d5672df48a5bc0ed858821bf40.zip |
Fixing tests broken by caching autoload results
These tests tried to load something, verified
the loads didn't work, and then created
the thing to load. This is a bit silly,
so I just removed those sections of the tests.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'test')
-rwxr-xr-x | test/language/functions.rb | 4 | ||||
-rwxr-xr-x | test/util/subclass_loader.rb | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/test/language/functions.rb b/test/language/functions.rb index 9f0e8a594..af0732559 100755 --- a/test/language/functions.rb +++ b/test/language/functions.rb @@ -359,8 +359,8 @@ class TestLangFunctions < Test::Unit::TestCase end def test_autoloading_functions - assert_equal(false, Puppet::Parser::Functions.function(:autofunc), - "Got told autofunc already exists") + #assert_equal(false, Puppet::Parser::Functions.function(:autofunc), + # "Got told autofunc already exists") dir = tempfile() $: << dir diff --git a/test/util/subclass_loader.rb b/test/util/subclass_loader.rb index 34b8803fc..0efd636f4 100755 --- a/test/util/subclass_loader.rb +++ b/test/util/subclass_loader.rb @@ -31,13 +31,6 @@ class TestPuppetUtilSubclassLoader < Test::Unit::TestCase end def test_subclass_loading - # Make sure we don't get a failure but that we also get nothing back - assert_nothing_raised do - assert_nil(LoadTest.faker(:fake), - "Got something back from a missing subclass") - assert_nil(LoadTest.fake, - "Got something back from missing subclass method") - end # Make a fake client mk_subclass("fake", "puppet/fakeloaders", "TestPuppetUtilSubclassLoader::LoadTest") |