Skip to content

[25.1] Apply tool test timeout only once#21246

Merged
jmchilton merged 1 commit intogalaxyproject:release_25.1from
bernt-matthias:fix-test-timeout
Nov 5, 2025
Merged

[25.1] Apply tool test timeout only once#21246
jmchilton merged 1 commit intogalaxyproject:release_25.1from
bernt-matthias:fix-test-timeout

Conversation

@bernt-matthias
Copy link
Copy Markdown
Contributor

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 for each output

this 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

except Exception as e:
and just registered. Alternative to the current change we could introduce a special case for timeout exceptions, e.g. register and abort?

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

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.
@github-actions github-actions Bot added this to the 26.0 milestone Nov 5, 2025
@jmchilton jmchilton merged commit 080640d into galaxyproject:release_25.1 Nov 5, 2025
52 of 55 checks passed
@ahmedhamidawan ahmedhamidawan modified the milestones: 26.0, 25.1 Nov 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants