Handle expected OCE disposing fixture

Author: halter73

tests/ModelContextProtocol.TestSseServer/Program.cs

@@ -27,9 +27,9 @@ private static ILoggerFactory CreateLoggerFactory()
         });
     }
 
-    public static Task Main(string[] args) => MainAsync(args, CancellationToken.None);
+    public static Task Main(string[] args) => MainAsync(args);
 
-    public static async Task MainAsync(string[] args, CancellationToken cancellationToken)
+    public static async Task MainAsync(string[] args, CancellationToken cancellationToken = default)
     {
         Console.WriteLine("Starting server...");
 
@@ -394,8 +394,15 @@ static CreateMessageRequestParams CreateRequestSamplingParams(string context, st
 
         Console.WriteLine("Server started.");
 
-        // Run until process is stopped by the client (parent process)
-        await Task.Delay(Timeout.Infinite, cancellationToken);
+        try
+        {
+            // Run until process is stopped by the client (parent process) or test
+            await Task.Delay(Timeout.Infinite, cancellationToken);
+        }
+        finally
+        {
+            await server.DisposeAsync();
+        }
     }
 
     const string MCP_TINY_IMAGE =

tests/ModelContextProtocol.Tests/SseServerIntegrationTestFixture.cs

@@ -41,7 +41,13 @@ public async ValueTask DisposeAsync()
     {
         LoggerFactory.Dispose();
         _stopCts.Cancel();
-        await _serverTask.ConfigureAwait(false);
+        try
+        {
+            await _serverTask.ConfigureAwait(false);
+        }
+        catch (OperationCanceledException)
+        {
+        }
         _stopCts.Dispose();
     }
 }