Skip to content

Replace Task.WhenAny timeout pattern with Task.WaitAsync #1253

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

Closed
Copilot wants to merge 2 commits into from
+3 −15
Closed

Replace Task.WhenAny timeout pattern with Task.WaitAsync #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1992622
Initial plan
Copilot Feb 6, 2026
2841328
Replace Task.WhenAny with Task.WaitAsync in dispose tests
Copilot Feb 6, 2026
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
12 changes: 2 additions & 10 deletions tests/ModelContextProtocol.AspNetCore.Tests/MapMcpStreamableHttpTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,7 @@ public async Task DisposeAsync_DoesNotHang_WhenOwnsSessionIsFalse()

// This should not hang. The issue reports that DisposeAsync hangs indefinitely
// when OwnsSession is false. Use a timeout to detect the hang.
var disposeTask = client.DisposeAsync().AsTask();
var completedTask = await Task.WhenAny(disposeTask, Task.Delay(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken));

Assert.True(disposeTask == completedTask, "DisposeAsync hung when OwnsSession was false.");
await disposeTask; // Observe any exceptions
await client.DisposeAsync().AsTask().WaitAsync(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken);
}

[Fact]
Expand Down Expand Up @@ -530,10 +526,6 @@ public async Task DisposeAsync_DoesNotHang_WhenOwnsSessionIsFalse_WithUnsolicite
await Task.Delay(100, TestContext.Current.CancellationToken);

// Dispose should still not hang
var disposeTask = client.DisposeAsync().AsTask();
var completedTask = await Task.WhenAny(disposeTask, Task.Delay(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken));

Assert.True(disposeTask == completedTask, "DisposeAsync hung when OwnsSession was false after receiving unsolicited messages.");
await disposeTask;
await client.DisposeAsync().AsTask().WaitAsync(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken);
}
}
6 changes: 1 addition & 5 deletions tests/ModelContextProtocol.AspNetCore.Tests/StreamableHttpClientConformanceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,11 +366,7 @@ public async Task DisposeAsync_DoesNotHang_WhenOwnsSessionIsFalse_WithActiveGetS
await getRequestReceived.Task.WaitAsync(TestConstants.DefaultTimeout, TestContext.Current.CancellationToken);

// Dispose should not hang even though the GET stream is actively open
var disposeTask = client.DisposeAsync().AsTask();
var completedTask = await Task.WhenAny(disposeTask, Task.Delay(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken));

Assert.True(disposeTask == completedTask, "DisposeAsync hung with OwnsSession=false and active GET stream.");
await disposeTask;
await client.DisposeAsync().AsTask().WaitAsync(TimeSpan.FromSeconds(10), TestContext.Current.CancellationToken);
}
}

Expand Down