diff options
author | Luke Kanies <luke@madstop.com> | 2008-01-14 13:34:06 -0800 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-01-14 13:34:06 -0800 |
commit | cfda651f88d12249f29706d2bedbfddce7a2e6f7 (patch) | |
tree | 41c57e5e1405691a561b35b1ceac890c6a341ef3 /test/network/handler | |
parent | 488c43771aea482e0212b605bde054bf8cb0533c (diff) | |
download | puppet-cfda651f88d12249f29706d2bedbfddce7a2e6f7.tar.gz puppet-cfda651f88d12249f29706d2bedbfddce7a2e6f7.tar.xz puppet-cfda651f88d12249f29706d2bedbfddce7a2e6f7.zip |
Another round of test-fixes toward eliminating global resource
references. This should have gotten rid of all of them,
and now it's just a question of fixing a few hopefully unrelated
failing tests.
Diffstat (limited to 'test/network/handler')
-rwxr-xr-x | test/network/handler/resource.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/test/network/handler/resource.rb b/test/network/handler/resource.rb index 00a88b57f..5102291e1 100755 --- a/test/network/handler/resource.rb +++ b/test/network/handler/resource.rb @@ -13,7 +13,6 @@ class TestResourceServer < Test::Unit::TestCase def verify_described(type, described) described.each do |name, trans| - type.clear obj = nil assert_nothing_raised do obj = trans.to_type @@ -28,7 +27,6 @@ class TestResourceServer < Test::Unit::TestCase assert_equal(Puppet::Type.type(:package).defaultprovider.name, obj[:provider]) end end - type.clear end def test_describe_file @@ -64,9 +62,6 @@ class TestResourceServer < Test::Unit::TestCase assert_instance_of(Puppet::TransObject, result) - # Now we have to clear, so that the server's object gets removed - Puppet::Type.type(:file).clear - # And remove the file, so we can verify it gets recreated if i == 0 File.unlink(file) @@ -140,9 +135,6 @@ class TestResourceServer < Test::Unit::TestCase assert_instance_of(Puppet::TransObject, result) - # Now we have to clear, so that the server's object gets removed - Puppet::Type.type(:file).clear - # And remove the file, so we can verify it gets recreated Dir.rmdir(file) @@ -198,8 +190,6 @@ class TestResourceServer < Test::Unit::TestCase bucket = server.list(type.name) } - #type.clear - count = 0 described = {} bucket.each do |obj| @@ -251,8 +241,6 @@ class TestResourceServer < Test::Unit::TestCase filetrans = server.describe("file", file) } - Puppet::Type.type(:file).clear - bucket = Puppet::TransBucket.new bucket.type = "file" bucket.name = "test" @@ -273,7 +261,6 @@ class TestResourceServer < Test::Unit::TestCase yaml = Base64.encode64(YAML::dump(bucket)) } - Puppet::Type.type(:file).clear File.unlink(file) if Base64.decode64(yaml) =~ /(.{20}Loglevel.{20})/ |