diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-22 03:32:56 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-22 03:32:56 +0000 |
| commit | cdeccab2e0fc1b40b5060780c99d52f936f9732d (patch) | |
| tree | ea60c02ad605f553e75a19a8f5446194c4260c51 /test/puppettest.rb | |
| parent | b42eaee1a7e8dd1ef7a7daad5d0b03aba6113d00 (diff) | |
| download | puppet-cdeccab2e0fc1b40b5060780c99d52f936f9732d.tar.gz puppet-cdeccab2e0fc1b40b5060780c99d52f936f9732d.tar.xz puppet-cdeccab2e0fc1b40b5060780c99d52f936f9732d.zip | |
Another batch of bug fixes, this time focused on OS X patches. Looks like I did not test on os x last time.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1422 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/puppettest.rb')
| -rw-r--r-- | test/puppettest.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/puppettest.rb b/test/puppettest.rb index 121eee3e2..cc7ff2ccc 100644 --- a/test/puppettest.rb +++ b/test/puppettest.rb @@ -515,9 +515,11 @@ module ExeTest if pid == $$ raise Puppet::Error, "Tried to kill own pid" end - assert_nothing_raised { + begin Process.kill(:INT, pid) - } + rescue + # ignore it + end end end |