test/lib/envutil.rb (EnvUtil.timeout): added.

It is a wrapper for Timeout.timeout with the scale factor applied.

1 files changed, 7 insertions, 0 deletions

diff --git a/test/lib/envutil.rb b/test/lib/envutil.rb
index f4d63d5a0a..f9c0e57fcf 100644
--- a/test/lib/envutil.rb
+++ b/test/lib/envutil.rb
@@ -65,6 +65,13 @@ module EnvUtil
   end
   module_function :apply_timeout_scale
 
+  def timeout(sec, klass = nil, message = nil, &blk)
+    return yield(sec) if sec == nil or sec.zero?
+    sec = apply_timeout_scale(sec)
+    Timeout.timeout(sec, klass, message, &blk)
+  end
+  module_function :timeout
+
   def terminate(pid, signal = :TERM, pgroup = nil, reprieve = 1)
     reprieve = apply_timeout_scale(reprieve) if reprieve