summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-09-10 17:58:23 -0500
committerLuke Kanies <luke@madstop.com>2007-09-10 17:58:23 -0500
commitbb69a1f08a6b0ba37222eeddf28ffbff657283e7 (patch)
tree4e8f3a6d710445a218f87b0ab712f63d7b292914 /test
parent81149333c360d6f10e6c1cf58f43b6e18c0a55dc (diff)
downloadpuppet-bb69a1f08a6b0ba37222eeddf28ffbff657283e7.tar.gz
puppet-bb69a1f08a6b0ba37222eeddf28ffbff657283e7.tar.xz
puppet-bb69a1f08a6b0ba37222eeddf28ffbff657283e7.zip
Renaming the instance loader method to "instance_load". It was previously autoload, which could class with Kernel.autoload.
Diffstat (limited to 'test')
-rwxr-xr-xtest/util/instance_loader.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/util/instance_loader.rb b/test/util/instance_loader.rb
index fa08d1bd6..24e8c9cab 100755
--- a/test/util/instance_loader.rb
+++ b/test/util/instance_loader.rb
@@ -19,15 +19,15 @@ class TestInstanceloader < Test::Unit::TestCase
end
end
- assert_nothing_raised("Could not create autoloader") do
- @loader.autoload(:stuff, "puppet/stuff")
+ assert_nothing_raised("Could not create instance loader") do
+ @loader.instance_load(:stuff, "puppet/stuff")
end
end
# Make sure we correctly create our autoload instance. This covers the basics.
def test_autoload
# Make sure we can retrieve the loader
- assert_instance_of(Puppet::Util::Autoload, @loader.instance_loader(:stuff), "Could not get autoloader")
+ assert_instance_of(Puppet::Util::Autoload, @loader.instance_loader(:stuff), "Could not get instance loader")
# Make sure we can get the instance hash
assert(@loader.instance_hash(:stuff), "Could not get instance hash")
@@ -46,7 +46,7 @@ class TestInstanceloader < Test::Unit::TestCase
assert_equal("a value", @loader.loaded_instance(:stuff, :testing), "Got incorrect loaded instance")
end
- def test_autoloading
+ def test_instance_loading
end
end