diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-05-27 11:53:10 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-05-27 11:53:10 +1000 |
| commit | d2eb1948eefcf721382168fba0043fa28e69d3e4 (patch) | |
| tree | 5b6e558f3303464791aff093729d6da92fdfbb76 /test | |
| parent | 02411f5d74e9f437acdba9c75eb811b9976174c7 (diff) | |
| parent | 8a22b59c7d1f1a80c4fd645830ed9d5b33adf659 (diff) | |
| download | puppet-d2eb1948eefcf721382168fba0043fa28e69d3e4.tar.gz puppet-d2eb1948eefcf721382168fba0043fa28e69d3e4.tar.xz puppet-d2eb1948eefcf721382168fba0043fa28e69d3e4.zip | |
Merge branch 'tickets/1265' of git://github.com/lak/puppet into 0.24.x
Diffstat (limited to 'test')
| -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 9781e9589..56419b645 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) |