Re-fixed #2750 - Stop disabling the CRL or checking for a disabled CRL

This was deprecated in commit 1cfb0215 and was keeping puppetd from starting in listen mode.

Signed-off-by: John A. Barbuto <jbarbuto@corp.sourceforge.com>

2 files changed, 0 insertions, 20 deletions

diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb
index 19dfaf3e0..e5a51675d 100755
--- a/spec/unit/application/puppetd.rb
+++ b/spec/unit/application/puppetd.rb
@@ -407,14 +407,6 @@ describe "puppetd" do
                 @puppetd.setup_listen
             end
 
-            it "should set :cacrl to nil if no cacrl file" do
-                Puppet.expects(:[]).with(:cacrl).returns('cacrl')
-                File.expects(:exist?).with('cacrl').returns(false)
-                Puppet.expects(:[]=).with(:cacrl,nil)
-
-                @puppetd.setup_listen
-            end
-
             it "should create a server to listen on at least the Runner handler" do
                 Puppet::Network::Server.expects(:new).with { |args| args[:xmlrpc_handlers] == [:Runner] }
 
diff --git a/spec/unit/ssl/certificate_revocation_list.rb b/spec/unit/ssl/certificate_revocation_list.rb
index eb25268e6..3d15db78b 100755
--- a/spec/unit/ssl/certificate_revocation_list.rb
+++ b/spec/unit/ssl/certificate_revocation_list.rb
@@ -46,18 +46,6 @@ describe Puppet::SSL::CertificateRevocationList do
         end
     end
 
-    describe "when initializing" do
-        it "should fail if :cacrl is set to false" do
-            Puppet.settings.expects(:value).with(:cacrl).returns false
-            lambda { @class.new("crl") }.should raise_error(Puppet::Error)
-        end
-
-        it "should fail if :cacrl is set to the string 'false'" do
-            Puppet.settings.expects(:value).with(:cacrl).returns "false"
-            lambda { @class.new("crl") }.should raise_error(Puppet::Error)
-        end
-    end
-
     describe "when generating the crl" do
         before do
             @real_crl = mock 'crl'