Merge branch '0.24.x'

Conflicts:

	conf/redhat/puppet.spec

2 files changed, 0 insertions, 63 deletions

diff --git a/test/network/client/client.rb b/test/network/client/client.rb
index 2588b9be5..b6b915d31 100755
--- a/test/network/client/client.rb
+++ b/test/network/client/client.rb
@@ -221,34 +221,4 @@ class TestClient < Test::Unit::TestCase
             end
         end
     end
-
-    # Make sure that reading the cert in also sets up the cert stuff for the driver
-    def test_read_cert
-        Puppet::Util::SUIDManager.stubs(:asuser).yields
-
-        ca = Puppet::Network::Handler.ca.new
-        caclient = Puppet::Network::Client.ca.new :CA => ca
-
-        caclient.request_cert
-
-        # First make sure it doesn't get called when the driver doesn't support :cert_setup
-        client = FakeClient.new :Test => FakeDriver.new
-        driver = client.driver
-
-        assert_nothing_raised("Could not read cert") do
-            client.read_cert
-        end
-
-        # And then that it does when the driver supports it
-        client = FakeClient.new :Test => FakeDriver.new
-
-        driver = client.driver
-        driver.meta_def(:recycle_connection) { |c| }
-        driver.expects(:recycle_connection).with(client)
-
-        assert_nothing_raised("Could not read cert") do
-            client.read_cert
-        end
-    end
 end
-
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 60058aed9..696d08bfd 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -333,39 +333,6 @@ end
         assert(FileTest.exists?(file), "file was not created on second run")
     end
 
-    def test_default_objects
-        # 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")
-
-        master = mkclient()
-
-        # 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  { master.mkdefault_objects }
-        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
-
     # #540 - make sure downloads aren't affected by noop
     def test_download_in_noop
         source = tempfile