Fixing #927 -- rewriting the test to actually test what it's

supposed to be doing and to skip the whole network connect thing.

FTR, the reason this is happening is because the keepalive patch
causes http instances to start immediately, which wasn't previously
the case. I have been noticing that not all failures that should
result from this happen consistently.

1 files changed, 9 insertions, 4 deletions

diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index 74de37900..9781e9589 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -30,10 +30,15 @@ class TestClientCA < Test::Unit::TestCase
 
     # Make sure the ca defaults to specific ports and names
     def test_ca_server
-        client = nil
-        assert_nothing_raised do
-            client = Puppet::Network::Client.ca.new
-        end
+        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)
+        Puppet.settings.stubs(:value).with(:http_proxy_port).returns(nil)
+        Puppet.settings.stubs(:value).with(:http_keepalive).returns(false)
+
+        # Just throw an error; the important thing is the values, not what happens next.
+        Net::HTTP.stubs(:new).with("myca", 321, nil, nil).raises(ArgumentError)
+        assert_raise(ArgumentError) { Puppet::Network::Client.ca.new }
     end
 
     # #578