Skip to content

2.7.x - merge 2.6.x branch up #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffmccune merged 4 commits into from
Jan 13, 2012
Merged

2.7.x - merge 2.6.x branch up #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0e31d5
(#5246) Puppetd does not remove it's pidfile when it exits
ripienaar Jan 11, 2012
2a99004
Merge pull request #327 from ripienaar/bug/2.6.x/5246
slippycheeze Jan 11, 2012
3aed496
Merge branch '2.6.x' into 2.7.x
Jan 13, 2012
69dfb34
(#5246) Fix spec test expectations in 2.7.x branch
Jan 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/puppet/application/agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ def onetime
Puppet.err detail.to_s
end

@daemon.stop(:exit => false)

if not report
exit(1)
elsif options[:detailed_exitcodes] then
Expand Down
5 changes: 5 additions & 0 deletions spec/unit/application/agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,11 @@
expect { @puppetd.onetime }.to exit_with 0
end

it "should stop the daemon" do
@daemon.expects(:stop).with(:exit => false)
expect { @puppetd.onetime }.to exit_with 0
end

describe "and --detailed-exitcodes" do
before :each do
@puppetd.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
Expand Down