summaryrefslogtreecommitdiffstats
path: root/spec/unit/network/http/webrick.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-05-07 13:29:38 -0500
committerLuke Kanies <luke@madstop.com>2008-05-07 13:29:38 -0500
commit1cfb0215a4d56af9ac1e0c672d9ae597dfde846e (patch)
tree48529190b224006b12596ffafecbf9ffb49afca0 /spec/unit/network/http/webrick.rb
parent0365184aaec4d71f7fa93fc1534ae10f8f842bb7 (diff)
downloadpuppet-1cfb0215a4d56af9ac1e0c672d9ae597dfde846e.tar.gz
puppet-1cfb0215a4d56af9ac1e0c672d9ae597dfde846e.tar.xz
puppet-1cfb0215a4d56af9ac1e0c672d9ae597dfde846e.zip
The CRL is now automatically used or ignored.
Previously, you had to configure whether you wanted the CRL or not, which resulted in errors all the time when it was configured but unavailable. Now, Puppet will always create and try to use it, but you won't get failures if it's unavailable.
Diffstat (limited to 'spec/unit/network/http/webrick.rb')
-rw-r--r--spec/unit/network/http/webrick.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/spec/unit/network/http/webrick.rb b/spec/unit/network/http/webrick.rb
index 11b74ec3a..6d006992c 100644
--- a/spec/unit/network/http/webrick.rb
+++ b/spec/unit/network/http/webrick.rb
@@ -345,9 +345,8 @@ describe Puppet::Network::HTTP::WEBrick do
@server.setup_ssl[:SSLVerifyClient].should == OpenSSL::SSL::VERIFY_PEER
end
- it "should add an x509 store if the CRL is enabled" do
+ it "should add an x509 store" do
Puppet.settings.stubs(:value).returns "whatever"
- Puppet.settings.stubs(:value).with(:crl).returns true
Puppet.settings.stubs(:value).with(:hostcrl).returns '/my/crl'
@host.expects(:ssl_store).returns "mystore"
@@ -355,15 +354,6 @@ describe Puppet::Network::HTTP::WEBrick do
@server.setup_ssl[:SSLCertificateStore].should == "mystore"
end
- it "should not add an x509 store if the CRL is disabled" do
- Puppet.settings.stubs(:value).returns "whatever"
- Puppet.settings.stubs(:value).with(:crl).returns false
-
- @host.expects(:ssl_store).never
-
- @server.setup_ssl[:SSLCertificateStore].should be_nil
- end
-
it "should set the certificate name to 'nil'" do
@server.setup_ssl[:SSLCertName].should be_nil
end