diff options
| -rwxr-xr-x | test/puppet/tc_suidmanager.rb | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb index 449f2aef5..eeb56f2c9 100755 --- a/test/puppet/tc_suidmanager.rb +++ b/test/puppet/tc_suidmanager.rb @@ -80,20 +80,11 @@ class TestSUIDManager < Test::Unit::TestCase warn "Cannot run this test on ruby < 1.8.4" else set_exit_status! - - - Puppet::Util.expects(:execute).with( - 'yay', - { :failonfail => false, - :uid => @user.uid, - - :gid => @user.gid } - ).returns('output') - - - output = Puppet::Util::SUIDManager.run_and_capture 'yay', - @user.uid, - @user.gid + Puppet::Util. + expects(:execute). + with('yay',:combine => true, :failonfail => false, :uid => @user.uid, :gid => @user.gid). + returns('output') + output = Puppet::Util::SUIDManager.run_and_capture 'yay', @user.uid, @user.gid assert_equal 'output', output.first assert_kind_of Process::Status, output.last |