Revert "Apply timeout-scale to test_thr_kill." #7838
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit bbbec4b.
Because the commit is a bug. The bug was reported on the commit link bbbec4b. The
apply_timeout_scale
to scale the timeout is called 2 times in the process.The
test/ruby/test_thread_queue.rb#test_thr_kill
is callingEnvUtil.apply_timeout_scale
, andcalling
tool/lib/core_assertions.rb#assert_normal_exit
. callingtool/lib/envutil.rb#invoke_ruby
(EnvUtil.invoke_ruby
) calling theapply_timeout_scale
.I confirmed the issues by adding the debug log after each
EnvUtil.apply_timeout_scale
.The timeout is scaling from 60 to 120 and to 240 seconds.