diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2019-06-07 09:26:40 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2021-09-26 19:18:40 +0900 |
| commit | c4369b0010011006424f4e55216f425bdf9eec0a (patch) | |
| tree | a74b1cbb03f946bfd6f66088ae839feb5c1c2148 | |
| parent | 152afd40e17b70c32f048f1716f592d0a147a45e (diff) | |
| download | ruby-openssl-c4369b0010011006424f4e55216f425bdf9eec0a.tar.gz | |
test/openssl/utils.rb: Extend the timeout
[ This is a backport to the 2.1 branch. ]
https://rubyci.org/logs/rubyci.s3.amazonaws.com/scw-9d6766/ruby-master/log/20190606T171708Z.fail.html.gz
https://rubyci.org/logs/rubyci.s3.amazonaws.com/scw-9d6766/ruby-master/log/20190607T051708Z.fail.html.gz
(cherry picked from commit ruby/ruby@7e403dc6c84356e83c02538e76cc70ac789921ac and
commit ruby/ruby@75751dca2b9f573db923cecd9767e9174fb69a98)
| -rw-r--r-- | test/utils.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/utils.rb b/test/utils.rb index 1da3d8f7..bf191630 100644 --- a/test/utils.rb +++ b/test/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(30) + 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 = $! |