1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Yusuke Endoh 2019-06-07 09:26:40 +09:00
parent c7477c3e1f
commit 7e403dc6c8

View file

@ -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 = $!