Fix flaky DownloadQueue interruption test - #23269
Merged
Merged
Conversation
- Cancel staging when `Interrupt` arrives during fetch setup - Synchronise the regression test with the vulnerable setup window
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a race window in Homebrew::DownloadQueue#fetch so that an Interrupt arriving during early fetch setup reliably cancels active worker threads, and updates the regression spec to synchronise precisely with that vulnerable window to eliminate flakiness.
Changes:
- Add a top-level
rescue ExceptioninDownloadQueue#fetchto ensurecancelruns even ifInterruptoccurs before the parallel fetch loop is fully established. - Adjust the existing TTY-update rescue path to focus on restoring terminal state, relying on the new outer rescue for cancellation.
- Stabilise the “interrupts queued staging” spec by gating the interrupt on both “fetch setup started” and “staging started”.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| Library/Homebrew/download_queue.rb | Ensures cancellation runs on Interrupt even during early fetch setup, while keeping TTY restoration intact. |
| Library/Homebrew/test/download_queue_spec.rb | Synchronises the interrupt regression test with the fetch-setup timing window to reduce flakiness. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
MikeMcQuaid
enabled auto-merge
July 22, 2026 13:12
krehel
approved these changes
Jul 22, 2026
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.
Interruptarrives during fetch setupbrewcommands to reproduce the bug?brew lgtm(style, typechecking and tests) locally?OpenAI Sol 5.6 xhigh with local review and testing.