diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-02 13:47:44 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-02 13:47:44 -0500 |
| commit | 6356c043a44c771d707750f96f7660a1093be9ac (patch) | |
| tree | 509a3b2cdce0ff91ff62b960ac9c4c66de55ff2e /spec/unit/network/http/webrick.rb | |
| parent | 4c590df607f3d2cb6921b8d8269862a4f8f2456c (diff) | |
| download | puppet-6356c043a44c771d707750f96f7660a1093be9ac.tar.gz puppet-6356c043a44c771d707750f96f7660a1093be9ac.tar.xz puppet-6356c043a44c771d707750f96f7660a1093be9ac.zip | |
Switched puppetmasterd to use the new-style server plumbing.
The code is much cleaner, and it seems to be mostly
functional, but we have to pick a strategy for signing
the host's certificate on first startup. Also, I haven't
actually done end-to-end testing yet, which needs the certs
working first.
Diffstat (limited to 'spec/unit/network/http/webrick.rb')
| -rw-r--r-- | spec/unit/network/http/webrick.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/unit/network/http/webrick.rb b/spec/unit/network/http/webrick.rb index 0a26a58bd..b59dc9f13 100644 --- a/spec/unit/network/http/webrick.rb +++ b/spec/unit/network/http/webrick.rb @@ -411,6 +411,7 @@ describe Puppet::Network::HTTP::WEBrick do it "should add an x509 store if the CRL is enabled" do Puppet.settings.stubs(:value).returns "whatever" + Puppet.settings.stubs(:value).with(:crl).returns true Puppet.settings.stubs(:value).with(:hostcrl).returns '/my/crl' @server.expects(:setup_ssl_store).returns("mystore") @@ -420,7 +421,7 @@ describe Puppet::Network::HTTP::WEBrick do it "should not add an x509 store if the CRL is disabled" do Puppet.settings.stubs(:value).returns "whatever" - Puppet.settings.stubs(:value).with(:hostcrl).returns 'false' + Puppet.settings.stubs(:value).with(:crl).returns false @server.expects(:setup_ssl_store).never |