modelcontextprotocol/csharp-sdk
Watch
1
0
Fork
You've already forked csharp-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix flaky DiagnosticTests on net10.0 by waiting for specific activities (#1324)

Browse source 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
This commit is contained in:
Copilot 2026-02-19 19:42:45 -08:00 • committed by GitHub
commit d9ae6bc266
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/ModelContextProtocol.Tests/DiagnosticTests.cs
View file

@ -35,8 +35,10 @@ public class DiagnosticTests
// Wait for server-side activities to be exported. The server processes messages
// via fire-and-forget tasks, so activities may not be immediately available
// after the client operation completes.
await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 4);
// after the client operation completes. Wait for the specific activity we need
// rather than a count, as other server activities may be exported first.
await WaitForAsync(() => activities.Any(a =>
a.DisplayName == "tools/call DoubleValue" && a.Kind == ActivityKind.Server));
}
Assert.NotEmpty(activities);
@ -103,8 +105,11 @@ public class DiagnosticTests
await Assert.ThrowsAsync<McpProtocolException>(async () => await client.CallToolAsync("does-not-exist", cancellationToken: TestContext.Current.CancellationToken));
}, []);
// Wait for server-side activities to be exported.
await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 4);
// Wait for server-side activities to be exported. Wait for specific activities
// rather than a count, as other server activities may be exported first.
await WaitForAsync(() =>
activities.Any(a => a.DisplayName == "tools/call Throw" && a.Kind == ActivityKind.Server) &&
activities.Any(a => a.DisplayName == "tools/call does-not-exist" && a.Kind == ActivityKind.Server));
}
Assert.NotEmpty(activities);
@ -173,8 +178,10 @@ public class DiagnosticTests
await tool.InvokeAsync(new() { ["amount"] = 42 }, TestContext.Current.CancellationToken);
}, []);
// Wait for server-side activities to be exported.
await WaitForAsync(() => activities.Count(a => a.Kind == ActivityKind.Server) >= 3);
// Wait for server-side activities to be exported. Wait for specific activities
// rather than a count, as other server activities may be exported first.
await WaitForAsync(() => activities.Any(a =>
a.DisplayName == "tools/call DoubleValue" && a.Kind == ActivityKind.Server));
}
// The outer activity should have MCP-specific attributes added to it