Fixing some broken tests.

The HttpPool module now removes its cached ssl_host instance
when clearing its cache.  This is really only useful
for testing, but it correctly causes the pool to use
new certificates when they're available.

2 files changed, 2 insertions, 1 deletions

diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index 9781e9589..2546642cd 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -35,6 +35,7 @@ class TestClientCA < Test::Unit::TestCase
         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)
+        Puppet.settings.stubs(:value).with(:configtimeout).returns(180)
 
         # 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)
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index f4e5398b8..0cdade4ba 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -67,7 +67,7 @@ class TestWebrickServer < Test::Unit::TestCase
     end
 
     # Test that a client whose cert has been revoked really can't connect
-    def test_certificate_revocation
+    def test_xcertificate_revocation
         Puppet[:autosign] = true
 
         serverpid, server = mk_status_server