diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-25 23:43:33 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-25 23:43:33 +0000 |
| commit | 7d52ed594ecc0fe4587b2a9132f5b4a8e39cf2e9 (patch) | |
| tree | 36a7c60b04331d2a62d0339eb8ffa19fad89ac4a /test/ruby | |
| parent | 20a82f8839581742438b526a6acda447c43add34 (diff) | |
use timeout scale.
* test/lib/envutil.rb: introduce EnvUtil.apply_timeout_scale to use
this scale from outside.
* test/ruby/test_thread.rb (test_fork_in_thread): respect timeout scale.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
| -rw-r--r-- | test/ruby/test_thread.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index a4d70c4607..529c52f4ba 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -1135,9 +1135,9 @@ q.pop end Process.wait2(f.pid) end - unless th.join(3) + unless th.join(EnvUtil.apply_timeout_scale(3)) Process.kill(:QUIT, f.pid) - Process.kill(:KILL, f.pid) unless th.join(1) + Process.kill(:KILL, f.pid) unless th.join(EnvUtil.apply_timeout_scale(1)) end _, status = th.value output = f.read |