From 75234beb2456ce0a1f059e06bc5125cd18b683ab Mon Sep 17 00:00:00 2001 From: KJ Tsanaktsidis Date: Tue, 12 Mar 2024 20:55:44 +1100 Subject: [PATCH] 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. --- tool/test/testunit/tests_for_parallel/slow_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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