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

Ensure all test client instances are cleaned up (#3)

Browse source
This commit is contained in:
Stephen Toub 2025-03-19 17:27:49 -04:00 • committed by GitHub
commit 555933a06e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs
View file

@ -65,7 +65,7 @@ public class McpClientFactoryTests
}; };
// Act // Act
var client = await McpClientFactory.CreateAsync( await using var client = await McpClientFactory.CreateAsync(
serverConfig, serverConfig,
_defaultOptions, _defaultOptions,
(_, __) => new NopTransport()); (_, __) => new NopTransport());
@ -88,7 +88,7 @@ public class McpClientFactoryTests
}; };
// Act // Act
var client = await McpClientFactory.CreateAsync( await using var client = await McpClientFactory.CreateAsync(
serverConfig, serverConfig,
_defaultOptions, _defaultOptions,
(_, __) => new NopTransport()); (_, __) => new NopTransport());
@ -111,7 +111,7 @@ public class McpClientFactoryTests
}; };
// Act // Act
var client = await McpClientFactory.CreateAsync( await using var client = await McpClientFactory.CreateAsync(
serverConfig, serverConfig,
_defaultOptions, _defaultOptions,
(_, __) => new NopTransport()); (_, __) => new NopTransport());
@ -141,7 +141,7 @@ public class McpClientFactoryTests
}; };
// Act // Act
var client = await McpClientFactory.CreateAsync( await using var client = await McpClientFactory.CreateAsync(
serverConfig, serverConfig,
_defaultOptions, _defaultOptions,
(_, __) => new NopTransport()); (_, __) => new NopTransport());

12
tests/ModelContextProtocol.Tests/SseIntegrationTests.cs
View file

@ -37,7 +37,7 @@ public class SseIntegrationTests
}; };
// Act // 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 // Wait for SSE connection to be established
await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10)); await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
@ -82,7 +82,7 @@ public class SseIntegrationTests
}; };
// Create client and run tests // 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(); var tools = await client.ListToolsAsync().ToListAsync();
// assert // assert
@ -147,7 +147,7 @@ public class SseIntegrationTests
}, },
}; };
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 // Call the server's sampleLLM tool which should trigger our sampling handler
var result = await client.CallToolAsync( var result = await client.CallToolAsync(
@ -194,7 +194,7 @@ public class SseIntegrationTests
}; };
// Act // 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 // Wait for SSE connection to be established
await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10)); await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
@ -233,7 +233,7 @@ public class SseIntegrationTests
}; };
// Act // 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 // Wait for SSE connection to be established
await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10)); await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
@ -282,7 +282,7 @@ public class SseIntegrationTests
}; };
// Act // 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 mcpClient = (McpClient)client;
var transport = (SseClientTransport)mcpClient.Transport; var transport = (SseClientTransport)mcpClient.Transport;

2
tests/ModelContextProtocol.Tests/SseServerIntegrationTestFixture.cs
View file

@ -63,8 +63,6 @@ public class SseServerIntegrationTestFixture : IDisposable
{ {
try try
{ {
var client = McpClientFactory.CreateAsync(DefaultConfig, DefaultOptions, loggerFactory: LoggerFactory).GetAwaiter().GetResult();
client.DisposeAsync().AsTask().Wait();
LoggerFactory?.Dispose(); LoggerFactory?.Dispose();
} }
finally finally