diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/language/ast/definition.rb | 2 | ||||
| -rwxr-xr-x | test/language/parser.rb | 2 | ||||
| -rwxr-xr-x | test/language/resource.rb | 4 | ||||
| -rwxr-xr-x | test/language/scope.rb | 10 | ||||
| -rwxr-xr-x | test/util/autoload.rb | 27 |
5 files changed, 10 insertions, 35 deletions
diff --git a/test/language/ast/definition.rb b/test/language/ast/definition.rb index 7db5d2849..d4c987362 100755 --- a/test/language/ast/definition.rb +++ b/test/language/ast/definition.rb @@ -40,7 +40,7 @@ class TestASTDefinition < Test::Unit::TestCase def test_evaluate parser = mkparser - config = mkconfig + config = mkcompile config.send(:evaluate_main) scope = config.topscope klass = parser.newdefine "yayness", diff --git a/test/language/parser.rb b/test/language/parser.rb index d50bdfe5a..1cef72dcb 100755 --- a/test/language/parser.rb +++ b/test/language/parser.rb @@ -42,7 +42,7 @@ class TestParser < Test::Unit::TestCase assert_raise(Puppet::ParseError, "Did not fail while parsing %s" % file) { parser.file = file ast = parser.parse - config = mkconfig(parser) + config = mkcompile(parser) config.compile #ast.classes[""].evaluate :scope => config.topscope } diff --git a/test/language/resource.rb b/test/language/resource.rb index 8978a3a37..f25be93b5 100755 --- a/test/language/resource.rb +++ b/test/language/resource.rb @@ -392,7 +392,7 @@ class TestResource < PuppetTest::TestCase {:name => "one", :title => "two"}, {:title => "three"}, ].each do |hash| - config = mkconfig parser + config = mkcompile parser args = {:type => "yayness", :title => hash[:title], :source => klass, :scope => config.topscope} if hash[:name] @@ -439,7 +439,7 @@ class TestResource < PuppetTest::TestCase :code => resourcedef("file", varref("name"), "mode" => "644")) - config = mkconfig(parser) + config = mkcompile(parser) res = mkresource :type => "yayness", :title => "foo", :params => {}, :scope => config.topscope res.virtual = true diff --git a/test/language/scope.rb b/test/language/scope.rb index b317fa4c8..74f47b136 100755 --- a/test/language/scope.rb +++ b/test/language/scope.rb @@ -27,7 +27,7 @@ class TestScope < Test::Unit::TestCase end def test_variables - config = mkconfig + config = mkcompile topscope = config.topscope midscope = config.newscope(topscope) botscope = config.newscope(midscope) @@ -125,7 +125,7 @@ class TestScope < Test::Unit::TestCase end def test_setdefaults - config = mkconfig + config = mkcompile scope = config.topscope @@ -151,7 +151,7 @@ class TestScope < Test::Unit::TestCase end def test_lookupdefaults - config = mkconfig + config = mkcompile top = config.topscope # Make a subscope @@ -179,7 +179,7 @@ class TestScope < Test::Unit::TestCase end def test_parent - config = mkconfig + config = mkcompile top = config.topscope # Make a subscope @@ -332,7 +332,7 @@ class TestScope < Test::Unit::TestCase # Verify that we recursively mark as exported the results of collectable # components. def test_exportedcomponents - config = mkconfig + config = mkcompile parser = config.parser # Create a default source diff --git a/test/util/autoload.rb b/test/util/autoload.rb index 493fd7f60..bae6d37d4 100755 --- a/test/util/autoload.rb +++ b/test/util/autoload.rb @@ -50,11 +50,6 @@ TestAutoload.newthing(:#{name.to_s}) return rbdir, loader end - def teardown - super - Puppet::Util::Autoload.clear - end - def test_load dir, loader = mk_loader(:yayness) @@ -84,36 +79,18 @@ TestAutoload.newthing(:#{name.to_s}) assert(self.class.thing?(:mything), "Did not get loaded thing") - # Now clear everything, and test loadall - assert_nothing_raised { - Puppet::Util::Autoload.clear - } - self.class.clear - assert_nothing_raised { - loader.loadall - } - [:mything, :othing].each do |thing| + loader.load(thing) assert(loader.loaded?(thing), "#{thing.to_s} not considered loaded") assert(loader.loaded?("%s.rb" % thing), "#{thing.to_s} not considered loaded with .rb") assert(Puppet::Util::Autoload.loaded?("yayness/%s" % thing), "%s not considered loaded by the main class" % thing) assert(Puppet::Util::Autoload.loaded?("yayness/%s.rb" % thing), "%s not considered loaded by the main class with .rb" % thing) - loaded = Puppet::Util::Autoload.loaded?("yayness/%s.rb" % thing) - assert_equal("%s/%s.rb" % [dir, thing], loaded[:file], "File path was not set correctly in loaded store") - assert_equal(self.class, loaded[:autoloader], "Loader was not set correctly in loaded store") - assert(self.class.thing?(thing), "Did not get loaded #{thing.to_s}") end - - Puppet::Util::Autoload.clear - [:mything, :othing].each do |thing| - assert(! loader.loaded?(thing), "#{thing.to_s} considered loaded after clear") - assert(! Puppet::Util::Autoload.loaded?("yayness/%s" % thing), "%s considered loaded by the main class after clear" % thing) - end end # Make sure that autoload dynamically modifies $: with the libdir as @@ -126,5 +103,3 @@ TestAutoload.newthing(:#{name.to_s}) assert(loader.send(:searchpath).include?(dir), "searchpath does not include the libdir") end end - -# $Id$ |