summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/lib/puppettest.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index bff410060..4fa7a676f 100644
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -179,7 +179,15 @@ module PuppetTest
Puppet::Log.close
# Just in case there are processes waiting to die...
- Process.waitall
+ require 'timeout'
+
+ begin
+ Timeout::timeout(5) do
+ Process.waitall
+ end
+ rescue Timeout::Error
+ # just move on
+ end
if File.stat("/dev/null").mode & 007777 != 0666
File.open("/tmp/nullfailure", "w") { |f|
f.puts self.class