fix(ci): improve trap handling in regression and test scripts #3260
Conversation
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
Refactor trap usage in .github/regression.sh to use a variable for the error trap string, ensuring proper quoting and shellcheck compliance. Enhance cleanup logic to ignore further interrupts and errors during cleanup, and disable unnecessary traps after tests finish. In .github/run_tests.sh, add --foreground to the timeout command to ensure proper signal handling when running pytest with a session timeout.
mkoura
force-pushed
the
fix_signal_handling
branch
from
a1cb8ba to
61f4bf3
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves trap handling and signal management in CI scripts by refactoring the error trap implementation and enhancing cleanup robustness. However, the refactoring introduces a bug where $LINENO is expanded immediately when setting traps rather than when errors occur.
Key Changes
- Added
--foregroundflag to timeout command for proper signal propagation to pytest - Refactored ERR trap to use a variable (
basic_err_string) for consistency - Enhanced cleanup logic to ignore interrupts and errors during cleanup operations
- Protected MON_PID variable reference with parameter expansion
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
.github/run_tests.sh |
Adds --foreground flag to timeout command to ensure proper signal handling for pytest subprocess |
.github/regression.sh |
Refactors ERR trap using variable, enhances cleanup interrupt handling, protects MON_PID reference, and manages trap states throughout script lifecycle |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Refactor trap usage in .github/regression.sh to use a variable for the error trap string, ensuring proper quoting and shellcheck compliance. Enhance cleanup logic to ignore further interrupts and errors during cleanup, and disable unnecessary traps after tests finish.
In .github/run_tests.sh, add --foreground to the timeout command to ensure proper signal handling when running pytest with a session timeout.