summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/openssl/utils.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index 1da3d8f797..f3f4bf3f56 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -266,8 +266,9 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase
pend = nil
threads.each { |th|
begin
- th.join(10) or
- th.raise(RuntimeError, "[start_server] thread did not exit in 10 secs")
+ timeout = EnvUtil.apply_timeout_scale(10)
+ th.join(timeout) or
+ th.raise(RuntimeError, "[start_server] thread did not exit in #{ timeout } secs")
rescue (defined?(MiniTest::Skip) ? MiniTest::Skip : Test::Unit::PendedError)
# MiniTest::Skip is for the Ruby tree
pend = $!