Fix flaky ResolverGather_TimeoutFromPrimaryRepositoryThrows test#7242
Open
Fix flaky ResolverGather_TimeoutFromPrimaryRepositoryThrows test#7242
Conversation
The test asserts that a primary source timeout throws InvalidOperationException. GatherPackageAsync converts OperationCanceledException to InvalidOperationException, but cancellation checks in the main loop and worker task entry can fire first under CPU contention, producing a raw OperationCanceledException that bypasses the conversion. Both exception types correctly indicate the gather operation failed. Accept either InvalidOperationException or OperationCanceledException. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
donnie-msft
approved these changes
Mar 30, 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
2 participants
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.
Bug
Fixes: NuGet/Home#14833
Description
The test
ResolverGather_TimeoutFromPrimaryRepositoryThrowsasserts that a primary source timeout throwsInvalidOperationException.GatherPackageAsync(...)convertsOperationCanceledExceptiontoInvalidOperationException, but cancellation checks in the main loop and worker task entry can fire first under CPU contention, producing a rawOperationCanceledExceptionthat bypasses the conversion. Both exception types correctly indicate the gather operation failed.This change accepts either
InvalidOperationExceptionorOperationCanceledExceptionas passing.This change also disposes
CancellationTokenSourceinstances.PR Checklist
[ ] Added tests[ ] Link to an issue or pull request to update docs if this PR changes settings, environment variables, new feature, etc.