summaryrefslogtreecommitdiff
path: root/test/openssl
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2019-06-07 09:26:40 +0900
committerYusuke Endoh <mame@ruby-lang.org>2019-06-07 09:26:40 +0900
commit7e403dc6c84356e83c02538e76cc70ac789921ac (patch)
tree8c9286a61840d768acf8e23595fc7f176bfe7a04 /test/openssl
parentc7477c3e1fb661ed1cbcda9c7fbc710f77390845 (diff)
test/openssl/utils.rb: Extend the timeout
https://rubyci.org/logs/rubyci.s3.amazonaws.com/scw-9d6766/ruby-master/log/20190606T171708Z.fail.html.gz
Diffstat (limited to 'test/openssl')
-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 = $!