Skip to content

Commit

Permalink
Merge branch '4.3.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis Fields committed Oct 30, 2014
2 parents 12f7344 + 0db72ea commit 35c2dc7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/puppet/parser/functions/validate_cmd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ module Puppet::Parser::Functions
rescue Puppet::ExecutionFailure => detail
msg += "\n#{detail}"
raise Puppet::ParseError, msg
rescue SystemCallError => detail
msg += "\nWin32::Process::SystemCallError #{detail}"
rescue Exception => detail
msg += "\n#{detail.class.name} #{detail}"
raise Puppet::ParseError, msg
ensure
tmpfile.unlink
Expand Down
4 changes: 3 additions & 1 deletion spec/acceptance/validate_cmd_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
validate_cmd($one,$two,"aoeu is dvorak")
EOS

expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/aoeu is dvorak/)
apply_manifest(pp, :expect_failures => true) do |output|
expect(output.stderr).to match(/aoeu is dvorak/)
end
end
end
describe 'failure' do
Expand Down

0 comments on commit 35c2dc7

Please sign in to comment.