summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKJ Tsanaktsidis <kj@kjtsanaktsidis.id.au>2024-03-12 20:55:44 +1100
committerKJ Tsanaktsidis <kj@kjtsanaktsidis.id.au>2024-03-28 09:48:53 +1100
commit75234beb2456ce0a1f059e06bc5125cd18b683ab (patch)
tree8288e8f5bef7e5ae626a726f2a64fb353c71bbe3
parent7bdd742c0241435001efe641332b2088536bd074 (diff)
Make TestParallel#test_retry_workers consider RUBY_TEST_TIMEOUT_SCALE
This test currently fails if RUBY_TEST_TIMEOUT_SCALE is set, because the worker timeout is scaled out but the duration of the sleep does not; thus, the test-test-case does not timeout when it should.
-rw-r--r--tool/test/testunit/tests_for_parallel/slow_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/test/testunit/tests_for_parallel/slow_helper.rb b/tool/test/testunit/tests_for_parallel/slow_helper.rb
index d8372730a8..38067c1f47 100644
--- a/tool/test/testunit/tests_for_parallel/slow_helper.rb
+++ b/tool/test/testunit/tests_for_parallel/slow_helper.rb
@@ -2,6 +2,7 @@ require 'test/unit'
module TestSlowTimeout
def test_slow
- sleep (ENV['sec'] || 3).to_i if on_parallel_worker?
+ sleep_for = EnvUtil.apply_timeout_scale((ENV['sec'] || 3).to_i)
+ sleep sleep_for if on_parallel_worker?
end
end