diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-21 19:43:45 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-09-21 19:43:45 +0000 |
| commit | 9afdf1fa429cd5f81f68d27e172af208d6118e22 (patch) | |
| tree | c0d31891ab7f87fd5753bfab9b058b156d1b5bf3 /test | |
| parent | 1ae434461d074dc859f768776af3934b66282d07 (diff) | |
| download | puppet-9afdf1fa429cd5f81f68d27e172af208d6118e22.tar.gz puppet-9afdf1fa429cd5f81f68d27e172af208d6118e22.tar.xz puppet-9afdf1fa429cd5f81f68d27e172af208d6118e22.zip | |
Adding an Autoload instance to Type.rb so that I can load all known types for documentation purposes. And, of course, loading all types in puppetdoc. Also updating zone.rb to fix markdown's stupidity in trying to interpret the ERB template, and adding some timeouts to puppettest.rb
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1651 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/puppettest.rb | 10 |
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 |