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.

1 files changed, 0 insertions, 107 deletions

diff --git a/spec/unit/network/xmlrpc/client.rb b/spec/unit/network/xmlrpc/client.rb
deleted file mode 100755
index b40486e13..000000000
--- a/spec/unit/network/xmlrpc/client.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2007-11-26.
-#  Copyright (c) 2007. All rights reserved.
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require 'puppet/network/xmlrpc/client'
-
-describe Puppet::Network::XMLRPCClient, " when managing http instances" do
-    def stub_settings(settings)
-        settings.each do |param, value|
-            Puppet.settings.stubs(:value).with(param).returns(value)
-        end
-    end
-
-    it "should return an http instance created with the passed host and port" do
-        http = stub 'http', :use_ssl= => nil, :read_timeout= => nil, :open_timeout= => nil, :enable_post_connection_check= => nil, :started? => false
-        Net::HTTP.expects(:new).with("me", 54321, nil, nil).returns(http)
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).should equal(http)
-    end
-
-    it "should enable ssl on the http instance" do
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).instance_variable_get("@use_ssl").should be_true
-    end
-
-    it "should set the read timeout" do
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).read_timeout.should == 120
-    end
-
-    it "should set the open timeout" do
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).open_timeout.should == 120
-    end
-
-    it "should default to http_enable_post_connection_check being enabled" do
-        Puppet.settings[:http_enable_post_connection_check].should be_true
-    end
-
-    # JJM: I'm not sure if this is correct, as this really follows the
-    # configuration option.
-    it "should set enable_post_connection_check true " do
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).instance_variable_get("@enable_post_connection_check").should be_true
-    end
-
-    it "should create the http instance with the proxy host and port set if the http_proxy is not set to 'none'" do
-        stub_settings :http_keepalive => true, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).open_timeout.should == 120
-    end
-
-    it "should default to keep-alive being enabled" do
-        Puppet.settings[:http_keepalive].should be_true
-    end
-
-    it "should cache http instances if keepalive is enabled" do
-        stub_settings :http_keepalive => true, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        old = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).should equal(old)
-    end
-
-    it "should not cache http instances if keepalive is not enabled" do
-        stub_settings :http_keepalive => false, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        old = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).should_not equal(old)
-    end
-
-    it "should have a mechanism for getting a new http instance instead of the cached instance" do
-        stub_settings :http_keepalive => true, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        old = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321, true).should_not equal(old)
-    end
-
-    it "should close existing, open connections when requesting a new connection" do
-        stub_settings :http_keepalive => true, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        old = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        old.expects(:started?).returns(true)
-        old.expects(:finish)
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321, true)
-    end
-
-    it "should have a mechanism for clearing the http cache" do
-        stub_settings :http_keepalive => true, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        old = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).should equal(old)
-        old = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        Puppet::Network::XMLRPCClient.clear_http_instances
-        Puppet::Network::XMLRPCClient.http_instance("me", 54321).should_not equal(old)
-    end
-
-    it "should close open http connections when clearing the cache" do
-        stub_settings :http_keepalive => true, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        one = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        one.expects(:started?).returns(true)
-        one.expects(:finish).returns(true)
-        Puppet::Network::XMLRPCClient.clear_http_instances
-    end
-
-    it "should not close unopened http connections when clearing the cache" do
-        stub_settings :http_keepalive => true, :http_proxy_host => "myhost", :http_proxy_port => 432, :http_enable_post_connection_check => true
-        one = Puppet::Network::XMLRPCClient.http_instance("me", 54321)
-        one.expects(:started?).returns(false)
-        one.expects(:finish).never
-        Puppet::Network::XMLRPCClient.clear_http_instances
-    end
-
-    after do
-        Puppet::Network::XMLRPCClient.clear_http_instances
-    end
-end