diff options
| -rw-r--r-- | lib/puppet/application/puppetd.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/application/puppetd.rb | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb index 4799d5571..26c9f825e 100644 --- a/lib/puppet/application/puppetd.rb +++ b/lib/puppet/application/puppetd.rb @@ -164,7 +164,7 @@ Puppet::Application.new(:puppetd) do # to clients. In the meantime, we just disable CRL checking if # the CRL file doesn't exist unless File::exist?(Puppet[:cacrl]) - Puppet[:cacrl] = 'false' + Puppet[:cacrl] = nil end handlers = nil diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb index d34ec9f2f..19dfaf3e0 100755 --- a/spec/unit/application/puppetd.rb +++ b/spec/unit/application/puppetd.rb @@ -40,7 +40,7 @@ describe "puppetd" do describe "in preinit" do before :each do - @pupetd.stubs(:trap) + @puppetd.stubs(:trap) end it "should catch INT" do @@ -407,6 +407,14 @@ 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] } |