[25.1] Apply tool test timeout only once#21246
Merged
jmchilton merged 1 commit intogalaxyproject:release_25.1from Nov 5, 2025
Merged
[25.1] Apply tool test timeout only once#21246jmchilton merged 1 commit intogalaxyproject:release_25.1from
jmchilton merged 1 commit intogalaxyproject:release_25.1from
Conversation
during tool tests the `wait_for_job` function which waits for a result or a timeout (given eg by planemo or DEFAULT_TOOL_TEST_WAIT) was applied twice: 1. in `_verify_outputs` 2. in `verify_output` (which is called by `_verify_outputs` this made the waiting time twice as large as expected. I removed the call from the 2nd.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
during tool tests the
wait_for_jobfunction which waits for a result or a timeout (given eg by planemo or DEFAULT_TOOL_TEST_WAIT) was applied twice:_verify_outputsverify_output(which is called by_verify_outputsfor each outputthis made the waiting time at least twice as large as expected.
I removed the call from the 2nd.
This was already included here #14667 but I closed it because I had no answer for the question of @mvdbeek #14667 (comment)
The answer is: because timeout exceptions are caught
galaxy/lib/galaxy/tool_util/verify/interactor.py
Line 1702 in ea934db
How to test the changes?
(Select all options that apply)
License