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.

3 files changed, 0 insertions, 21 deletions

diff --git a/test/network/client/resource.rb b/test/network/client/resource.rb
index eb8e829eb..f3c564d9d 100755
--- a/test/network/client/resource.rb
+++ b/test/network/client/resource.rb
@@ -38,7 +38,6 @@ class TestResourceClient < Test::Unit::TestCase
 
         assert_instance_of(Puppet::TransObject, tobj)
 
-        Puppet::Type.allclear
         obj = nil
         assert_nothing_raised {
             obj = tobj.to_type
@@ -49,7 +48,6 @@ class TestResourceClient < Test::Unit::TestCase
         File.unlink(file)
 
         # Now test applying
-        Puppet::Type.allclear
         result = nil
         assert_nothing_raised {
             result = client.apply(tobj)
@@ -57,7 +55,6 @@ class TestResourceClient < Test::Unit::TestCase
         assert(FileTest.exists?(file), "File was not created on apply")
 
         # Lastly, test "list"
-        Puppet::Type.allclear
         list = nil
         assert_nothing_raised {
             list = client.list("user")
@@ -70,14 +67,12 @@ class TestResourceClient < Test::Unit::TestCase
             break if count > 3
             assert_instance_of(Puppet::TransObject, tobj)
 
-            Puppet::Type.allclear
             tobj2 = nil
             assert_nothing_raised {
                 tobj2 = client.describe(tobj.type, tobj.name)
             }
 
             obj = nil
-            Puppet::Type.allclear
             assert_nothing_raised {
                 obj = tobj2.to_type
             }
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})/
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index d3408c166..e44d84dda 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -101,9 +101,6 @@ class TestWebrickServer < Test::Unit::TestCase
     
     def mk_status_client
         client = nil
-        # Otherwise, the client initalization will trip over itself
-        # since elements created in the last run are still around
-        Puppet::Type::allclear
 
         assert_nothing_raised() {
             client = Puppet::Network::Client.status.new(