Skip to content

Replace Task.WhenAny + Task.Delay timeout pattern with .WaitAsync(TimeSpan) #805

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

Merged
SteveSandersonMS merged 2 commits into from
Mar 12, 2026
Merged

Replace Task.WhenAny + Task.Delay timeout pattern with .WaitAsync(TimeSpan) #805

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
8c69763
Initial plan
Copilot Mar 12, 2026
20815e6
Replace Task.WhenAny+Task.Delay with .WaitAsync(TimeSpan)
Copilot Mar 12, 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
6 changes: 2 additions & 4 deletions dotnet/test/MultiClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,9 @@ public async Task Both_Clients_See_Tool_Request_And_Completion_Events()
Assert.Contains("MAGIC_hello_42", response!.Data.Content ?? string.Empty);

// Wait for all broadcast events to arrive on both clients
var timeout = Task.Delay(TimeSpan.FromSeconds(10));
var allEvents = Task.WhenAll(
await Task.WhenAll(
client1Requested.Task, client2Requested.Task,
client1Completed.Task, client2Completed.Task);
Assert.Equal(allEvents, await Task.WhenAny(allEvents, timeout));
client1Completed.Task, client2Completed.Task).WaitAsync(TimeSpan.FromSeconds(10));

await session2.DisposeAsync();

Expand Down
3 changes: 1 addition & 2 deletions dotnet/test/SessionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,7 @@ public async Task Should_Receive_Session_Events()
await session.SendAsync(new MessageOptions { Prompt = "What is 100+200?" });

// Wait for session to become idle (indicating message processing is complete)
var completed = await Task.WhenAny(idleReceived.Task, Task.Delay(TimeSpan.FromSeconds(60)));
Assert.Equal(idleReceived.Task, completed);
await idleReceived.Task.WaitAsync(TimeSpan.FromSeconds(60));

// Should have received multiple events (user message, assistant message, idle, etc.)
Assert.NotEmpty(receivedEvents);
Expand Down
Loading