Entirely refactoring http keep-alive. There's now

a central module responsible for managing the http pool
(Puppet::Network::HttpPool), and it also handles
setting certificate information.  This gets rid of
what were otherwise long chains of method calls,
and it makes the code paths much clearer.

4 files changed, 12 insertions, 70 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/server/webrick.rb b/test/network/server/webrick.rb
index 3561cd41a..d3408c166 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -14,6 +14,11 @@ class TestWebrickServer < Test::Unit::TestCase
         super
     end
 
+    def teardown
+        super
+        Puppet::Network::HttpPool.clear_http_instances
+    end
+
     # Make sure we can create a server, and that it knows how to create its
     # certs by default.
     def test_basics
@@ -102,7 +107,7 @@ class TestWebrickServer < Test::Unit::TestCase
 
         assert_nothing_raised() {
             client = Puppet::Network::Client.status.new(
-                :Server => Facter.value(:fqdn),
+                :Server => "localhost",
                 :Port => @@port
             )
         }
@@ -111,6 +116,7 @@ class TestWebrickServer < Test::Unit::TestCase
 
     def mk_status_server
         server = nil
+        Puppet[:certdnsnames] = "localhost"
         assert_nothing_raised() {
             server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
diff --git a/test/network/xmlrpc/client.rb b/test/network/xmlrpc/client.rb
index f6d234324..53be5ca07 100755
--- a/test/network/xmlrpc/client.rb
+++ b/test/network/xmlrpc/client.rb
@@ -42,43 +42,4 @@ class TestXMLRPCClient < Test::Unit::TestCase
 
         assert(net, "did not get net client")
     end
-
-    # Make sure the xmlrpc client is correctly reading all of the cert stuff
-    # and setting it into the @http var
-    def test_cert_setup
-        client = nil
-        assert_nothing_raised do
-            client = Puppet::Network::XMLRPCClient.new()
-        end
-
-        caclient = mock 'client', :cert => :ccert, :key => :ckey
-
-        FileTest.expects(:exist?).with(Puppet[:localcacert]).returns(true)
-
-        store = mock 'sslstore'
-        OpenSSL::X509::Store.expects(:new).returns(store)
-        store.expects(:add_file).with(Puppet[:localcacert])
-        store.expects(:purpose=).with(OpenSSL::X509::PURPOSE_SSL_CLIENT)
-
-        class << client
-            attr_accessor :http
-        end
-
-        http = mock 'http'
-        client.http = http
-
-        http.expects(:ca_file).returns(false)
-        http.expects(:ca_file=).with(Puppet[:localcacert])
-        http.expects(:cert=).with(:ccert)
-        http.expects(:key=).with(:ckey)
-        http.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
-        http.expects(:cert_store=)
-
-        assert_nothing_raised do
-            client.cert_setup(caclient)
-        end
-    end
-
-    def test_http_cache
-    end
 end
diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb
index 0f283be79..02bf8a5b3 100755
--- a/test/ral/types/filesources.rb
+++ b/test/ral/types/filesources.rb
@@ -22,6 +22,11 @@ class TestFileSources < Test::Unit::TestCase
         Puppet[:filetimeout] = -1
         Puppet::Util::SUIDManager.stubs(:asuser).yields 
     end
+
+    def teardown
+        super
+        Puppet::Network::HttpPool.clear_http_instances
+    end
     
     def use_storage
         begin