Skip to content

Revert: No changes needed for flaky DiagnosticTests #997

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 6 commits into from
Closed

Revert: No changes needed for flaky DiagnosticTests #997

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e280cd
Initial plan
Copilot Nov 20, 2025
92407d8
Fix flaky DiagnosticTests by clearing Activity.Current and forcing flush
Copilot Nov 20, 2025
d92872a
Use ExclusiveExecution collection fixture to ensure DiagnosticTests d…
Copilot Nov 20, 2025
259d8df
Revert to original DisableParallelization collection, remove Activity…
Copilot Nov 20, 2025
57b9aaf
Add ExclusiveExecution collection to prevent DiagnosticTests from run…
Copilot Nov 20, 2025
c51012c
Revert all changes - existing DisableParallelization collection is su…
Copilot Nov 20, 2025
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: 12 additions & 0 deletions tests/ModelContextProtocol.Tests/DiagnosticTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ public class DiagnosticTests
[Fact]
public async Task Session_TracksActivities()
{
// Ensure no ambient activity from previous tests
Activity.Current = null;
Comment thread
stephentoub marked this conversation as resolved.
Outdated

var activities = new List<Activity>();
var clientToServerLog = new List<string>();

Expand All @@ -32,6 +35,9 @@ await RunConnected(async (client, server) =>
var tool = tools.First(t => t.Name == "DoubleValue");
await tool.InvokeAsync(new() { ["amount"] = 42 }, TestContext.Current.CancellationToken);
}, clientToServerLog);

// Ensure all activities are flushed before disposal
tracerProvider.ForceFlush();
}

Assert.NotEmpty(activities);
Expand Down Expand Up @@ -77,6 +83,9 @@ await RunConnected(async (client, server) =>
[Fact]
public async Task Session_FailedToolCall()
{
// Ensure no ambient activity from previous tests
Activity.Current = null;

var activities = new List<Activity>();

using (var tracerProvider = OpenTelemetry.Sdk.CreateTracerProviderBuilder()
Expand All @@ -89,6 +98,9 @@ await RunConnected(async (client, server) =>
await client.CallToolAsync("Throw", cancellationToken: TestContext.Current.CancellationToken);
await Assert.ThrowsAsync<McpProtocolException>(async () => await client.CallToolAsync("does-not-exist", cancellationToken: TestContext.Current.CancellationToken));
}, []);

// Ensure all activities are flushed before disposal
tracerProvider.ForceFlush();
}

Assert.NotEmpty(activities);
Expand Down