[12.x] Fix queue fake cleanup to always restore original queue manager #56165
+8
−4
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
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.
The current implementations of
Queue::fakeFor()andQueue::fakeExceptFor()usetap()to restore the original queue manager after running a callback. However, if the callback throws an exception—such as a failed assertion(ExpectationFailedException)— the restoration never happens. This leaves the fake queue active outside the intended scope, causing tests to leak state and behave unpredictably.This PR replaces
tap()with atry...finallyblock to guarantee the original queue manager is always restored, even if exceptions occur during the callback execution.