Skip to content

Fix flaky ResolverGather_TimeoutFromPrimaryRepositoryThrows test #7242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dtivel wants to merge 1 commit into
base: dev
Choose a base branch
from
+11 −3
Open

Fix flaky ResolverGather_TimeoutFromPrimaryRepositoryThrows test #7242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions test/NuGet.Core.Tests/NuGet.PackageManagement.Test/ResolverGatherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,21 @@ public async Task ResolverGather_TimeoutFromPrimaryRepositoryThrows()
ResolutionContext = new ResolutionContext()
};

var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(500));
using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(500));

// Act and Assert
await Assert.ThrowsAsync<InvalidOperationException>(async () =>
// Under CPU contention, cancellation checks in the main loop may fire
// before worker tasks convert OperationCanceledException to
// InvalidOperationException. Both outcomes correctly indicate failure.
Exception exception = await Record.ExceptionAsync(async () =>
{
await ResolverGather.GatherAsync(context, cts.Token);
});

Assert.NotNull(exception);
Assert.True(
exception is InvalidOperationException || exception is OperationCanceledException,
$"Expected InvalidOperationException or OperationCanceledException but got {exception.GetType().Name}: {exception.Message}");
}

[Fact]
Expand Down Expand Up @@ -108,7 +116,7 @@ public async Task ResolverGather_TimeoutFromSecondaryRepositoryIgnored()
ResolutionContext = new ResolutionContext()
};

var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(5000));
using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(5000));

// Act
var results = await ResolverGather.GatherAsync(context, cts.Token);
Expand Down