Skip to content

Fix race condition in AutomaticInputRequiredStatusTests polling logic #1223

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
stephentoub merged 5 commits into from
Jan 30, 2026
Merged

Fix race condition in AutomaticInputRequiredStatusTests polling logic #1223

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da44c78
Initial plan
Copilot Jan 30, 2026
c5fa427
Fix intermittent race condition in AutomaticInputRequiredStatusTests
Copilot Jan 30, 2026
3a10c59
Use pattern matching syntax for status checks
Copilot Jan 30, 2026
bbd4a9f
Add parentheses for clarity in pattern matching conditions
Copilot Jan 30, 2026
b4541f8
Simplify polling condition to check for not completed
Copilot Jan 30, 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
4 changes: 2 additions & 2 deletions tests/ModelContextProtocol.Tests/Server/AutomaticInputRequiredStatusTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public async Task TaskStatus_TransitionsToInputRequired_DuringSampleAsync()
finalStatus = await taskStore.GetTaskAsync(mcpTask.TaskId, cancellationToken: TestContext.Current.CancellationToken);
maxAttempts--;
}
while (finalStatus?.Status == McpTaskStatus.Working && maxAttempts > 0);
while (finalStatus?.Status is not McpTaskStatus.Completed && maxAttempts > 0);

// Assert - Status should have been InputRequired during sampling
Assert.Contains(McpTaskStatus.InputRequired, statusesDuringSampling);
Expand Down Expand Up @@ -218,7 +218,7 @@ public async Task TaskStatus_TransitionsToInputRequired_DuringElicitAsync()
finalStatus = await taskStore.GetTaskAsync(mcpTask.TaskId, cancellationToken: TestContext.Current.CancellationToken);
maxAttempts--;
}
while (finalStatus?.Status == McpTaskStatus.Working && maxAttempts > 0);
while (finalStatus?.Status is not McpTaskStatus.Completed && maxAttempts > 0);

// Assert - Status should have been InputRequired during elicitation
Assert.Contains(McpTaskStatus.InputRequired, statusesDuringElicitation);
Expand Down