Further fixes toward #965. Turned out that the previous fix

caused other problems.

This whole thing will hopefully get *drastically* easier once we
get rid of global resources.

2 files changed, 0 insertions, 50 deletions

diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 3ec1d4d36..696d08bfd 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -333,54 +333,6 @@ end
         assert(FileTest.exists?(file), "file was not created on second run")
     end
 
-    def test_default_resources
-        client = mkclient()
-
-        # Make sure they start out missing
-        assert_nil(Puppet::Type.type(:filebucket)["puppet"],
-            "default filebucket already exists")
-        assert_nil(Puppet::Type.type(:schedule)["daily"],
-            "default schedules already exists")
-
-        client.make_default_resources
-
-        # Now make sure they got created
-        assert(Puppet::Type.type(:filebucket)["puppet"],
-            "default filebucket not found")
-        assert(Puppet::Type.type(:schedule)["daily"],
-            "default schedules not found")
-
-        # clear everything, and make sure we can recreate them
-        Puppet::Type.allclear
-        assert_nil(Puppet::Type.type(:filebucket)["puppet"],
-            "default filebucket not removed")
-        assert_nil(Puppet::Type.type(:schedule)["daily"],
-            "default schedules not removed")
-        assert_nothing_raised  { client.make_default_resources }
-        assert(Puppet::Type.type(:filebucket)["puppet"],
-            "default filebucket not found")
-        assert(Puppet::Type.type(:schedule)["daily"],
-            "default schedules not found")
-
-
-        # Make sure we've got schedules
-        assert(Puppet::Type.type(:schedule)["hourly"], "Could not retrieve hourly schedule")
-        assert(Puppet::Type.type(:filebucket)["puppet"], "Could not retrieve default bucket")
-    end
-
-    # #965 - make sure default objects don't conflict with existing
-    # objects.
-    def test_default_resources_do_not_conflict_with_managed_resources
-        # Create some that conflict with our defaults
-        bucket = Puppet::Type.type(:filebucket).create :name => "puppet"
-        schedule = Puppet::Type.type(:schedule).create :name => "daily"
-
-        client = mkclient()
-
-        # Then make sure creating new defaults doesn't throw an exception.
-        assert_nothing_raised("Default resources conflicted with resources in the catalog") { client.make_default_resources }
-    end
-
     # #540 - make sure downloads aren't affected by noop
     def test_download_in_noop
         source = tempfile
diff --git a/test/ral/types/file.rb b/test/ral/types/file.rb
index fdb2eb656..a3a0c579a 100755
--- a/test/ral/types/file.rb
+++ b/test/ral/types/file.rb
@@ -1787,8 +1787,6 @@ class TestFile < Test::Unit::TestCase
 
         assert_instance_of(Puppet::Network::Client::Dipper, file.bucket,
             "did not default to a filebucket for backups")
-        assert_equal(Puppet::Type.type(:filebucket)["puppet"].bucket, file.bucket,
-            "did not default to the 'puppet' filebucket")
     end
 
     # #515 - make sure 'ensure' other than "link" is deleted during recursion