Skip to content

Ensure all test client instances are cleaned up #3

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
merged 1 commit into from
Mar 19, 2025
+10 −12
Merged

Ensure all test client instances are cleaned up #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public async Task CreateAsync_WithValidStdioConfig_CreatesNewClient()
};

// Act
var client = await McpClientFactory.CreateAsync(
await using var client = await McpClientFactory.CreateAsync(
serverConfig,
_defaultOptions,
(_, __) => new NopTransport());
Expand All @@ -88,7 +88,7 @@ public async Task CreateAsync_WithNoTransportOptions_CreatesNewClient()
};

// Act
var client = await McpClientFactory.CreateAsync(
await using var client = await McpClientFactory.CreateAsync(
serverConfig,
_defaultOptions,
(_, __) => new NopTransport());
Expand All @@ -111,7 +111,7 @@ public async Task CreateAsync_WithValidSseConfig_CreatesNewClient()
};

// Act
var client = await McpClientFactory.CreateAsync(
await using var client = await McpClientFactory.CreateAsync(
serverConfig,
_defaultOptions,
(_, __) => new NopTransport());
Expand Down Expand Up @@ -141,7 +141,7 @@ public async Task CreateAsync_WithSse_CreatesCorrectTransportOptions()
};

// Act
var client = await McpClientFactory.CreateAsync(
await using var client = await McpClientFactory.CreateAsync(
serverConfig,
_defaultOptions,
(_, __) => new NopTransport());
Expand Down
12 changes: 6 additions & 6 deletions tests/ModelContextProtocol.Tests/SseIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public async Task ConnectAndReceiveMessage_InMemoryServer()
};

// Act
var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);

// Wait for SSE connection to be established
await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
Expand Down Expand Up @@ -82,7 +82,7 @@ public async Task ConnectAndReceiveMessage_EverythingServerWithSse()
};

// Create client and run tests
var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
var tools = await client.ListToolsAsync().ToListAsync();

// assert
Expand Down Expand Up @@ -147,7 +147,7 @@ public async Task Sampling_Sse_EverythingServer()
},
};

var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);

// Call the server's sampleLLM tool which should trigger our sampling handler
var result = await client.CallToolAsync(
Expand Down Expand Up @@ -194,7 +194,7 @@ public async Task ConnectAndReceiveMessage_InMemoryServer_WithFullEndpointEventU
};

// Act
var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);

// Wait for SSE connection to be established
await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
Expand Down Expand Up @@ -233,7 +233,7 @@ public async Task ConnectAndReceiveNotification_InMemoryServer()
};

// Act
var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);

// Wait for SSE connection to be established
await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
Expand Down Expand Up @@ -282,7 +282,7 @@ public async Task ConnectTwice_Throws()
};

// Act
var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
var mcpClient = (McpClient)client;
var transport = (SseClientTransport)mcpClient.Transport;

Expand Down
2 changes: 0 additions & 2 deletions tests/ModelContextProtocol.Tests/SseServerIntegrationTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ public void Dispose()
{
try
{
var client = McpClientFactory.CreateAsync(DefaultConfig, DefaultOptions, loggerFactory: LoggerFactory).GetAwaiter().GetResult();
client.DisposeAsync().AsTask().Wait();
LoggerFactory?.Dispose();
}
finally
Expand Down