diff options
| -rw-r--r-- | lib/puppet/application/puppetd.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/application/puppetd.rb | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb index 7a92db11d..1f97043fa 100644 --- a/lib/puppet/application/puppetd.rb +++ b/lib/puppet/application/puppetd.rb @@ -229,7 +229,7 @@ Puppet::Application.new(:puppetd) do enable_disable_client(@agent) if options[:enable] or options[:disable] - @daemon.agent = agent + @daemon.agent = agent if options[:client] # It'd be nice to daemonize later, but we have to daemonize before the # waitforcert happens. diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb index dcd86185c..08f2a070a 100755 --- a/spec/unit/application/puppetd.rb +++ b/spec/unit/application/puppetd.rb @@ -327,11 +327,18 @@ describe "puppetd" do end end - it "should inform the daemon about our agent" do + it "should inform the daemon about our agent if :client is set to 'true'" do + @puppetd.options.expects(:[]).with(:client).returns true @daemon.expects(:agent=).with(@agent) @puppetd.run_setup end + it "should not inform the daemon about our agent if :client is set to 'false'" do + @puppetd.options[:client] = false + @daemon.expects(:agent=).never + @puppetd.run_setup + end + it "should daemonize if needed" do Puppet.stubs(:[]).with(:daemonize).returns(true) |