diff options
| author | Luke Kanies <luke@madstop.com> | 2008-06-14 13:53:56 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-06-14 13:53:56 -0500 |
| commit | 6a61198f9293674a4bf0aa75bfbca10e20f64d20 (patch) | |
| tree | 0b1b6c4ffe6e69c3c9d3e9650620e3afbd486f18 /test/network/client/ca.rb | |
| parent | eaa6eabc680cb6264594e30fd6a56e3e36765269 (diff) | |
| parent | 7b2c310e18b214424ae082e6ed2354a07b708c6f (diff) | |
| download | puppet-6a61198f9293674a4bf0aa75bfbca10e20f64d20.tar.gz puppet-6a61198f9293674a4bf0aa75bfbca10e20f64d20.tar.xz puppet-6a61198f9293674a4bf0aa75bfbca10e20f64d20.zip | |
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
Diffstat (limited to 'test/network/client/ca.rb')
| -rwxr-xr-x | test/network/client/ca.rb | 1 |
1 files changed, 1 insertions, 0 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) |