Merge branch '0.24.x'

Also added the fixes to make the certhandler tests pass
even when certs exist; I'll deal with the conflict later.

Conflicts:

	CHANGELOG
	bin/puppetd
	lib/puppet/network/http/handler.rb
	lib/puppet/network/http/mongrel/rest.rb
	spec/integration/indirector/rest.rb
	spec/integration/network/server/mongrel.rb
	spec/integration/network/server/webrick.rb
	spec/unit/network/http/webrick.rb

2 files changed, 4 insertions, 11 deletions

diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index 2546642cd..1741c850a 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -30,6 +30,7 @@ class TestClientCA < Test::Unit::TestCase
 
     # Make sure the ca defaults to specific ports and names
     def test_ca_server
+        Puppet.settings.stubs(:value).returns "eh"
         Puppet.settings.expects(:value).with(:ca_server).returns("myca")
         Puppet.settings.expects(:value).with(:ca_port).returns(321)
         Puppet.settings.stubs(:value).with(:http_proxy_host).returns(nil)
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index c0d14ccee..5399fca13 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -454,17 +454,8 @@ end
 
         Puppet::Node::Facts.indirection.stubs(:save)
 
-        master = client = nil
-        assert_nothing_raised() {
-            master = Puppet::Network::Handler.master.new(
-                :Local => false
-            )
-        }
-        assert_nothing_raised() {
-            client = Puppet::Network::Client.master.new(
-                :Master => master
-            )
-        }
+        master = Puppet::Network::Handler.master.new( :Local => false)
+        client = Puppet::Network::Client.master.new( :Master => master)
 
         # Fake that it's local, so it creates the class file
         client.local = false
@@ -473,6 +464,7 @@ end
         client.expects(:setclasses).with do |array|
             array.length == 2 and array.include?("yaytest") and array.include?("bootest")
         end
+
         assert_nothing_raised {
             client.getconfig
         }