Connect client before sending SIGINT in test

Author: halter73

tests/ModelContextProtocol.Tests/StdioServerIntegrationTests.cs

@@ -1,4 +1,6 @@
-using System.Diagnostics;
+using ModelContextProtocol.Client;
+using ModelContextProtocol.Protocol.Transport;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace ModelContextProtocol.Tests;
@@ -26,19 +28,44 @@ public async Task SigInt_DisposesTestServerWithHosting_Gracefully()
 
         process.Start();
 
+        await using var streamServerTransport = new StreamServerTransport(
+            process.StandardOutput.BaseStream,
+            process.StandardInput.BaseStream,
+            serverName: "TestServerWithHosting");
+
+        var serverConfig = new McpServerConfig()
+        {
+            Id = "test-server-with-hosting",
+            Name = "TestServerWithHosting",
+            TransportType = TransportTypes.StdIo,
+        };
+
+        await using var client = await McpClientFactory.CreateAsync(serverConfig,
+            createTransportFunc: (_, _) => new TestClientTransport(streamServerTransport),
+            cancellationToken: TestContext.Current.CancellationToken);
+
         // I considered writing a similar test for windows using Ctrl-C, then saw that dotnet watch doesn't even send a Ctrl-C
         // signal because it's such a pain without support CREATE_NEW_PROCESS_GROUP in System.Diagnostics.Process.
         // https://github.com/dotnet/sdk/blob/43b1c12e3362098a23ca1018503eb56516840b6a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs#L277-L303
         // https://github.com/dotnet/runtime/issues/109432, https://github.com/dotnet/runtime/issues/44944
         Assert.Equal(0, kill(process.Id, SIGINT));
 
-        using var shutdownCts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+        using var shutdownCts = CancellationTokenSource.CreateLinkedTokenSource(TestContext.Current.CancellationToken);
+        shutdownCts.CancelAfter(TimeSpan.FromSeconds(10));
         await process.WaitForExitAsync(shutdownCts.Token);
 
         Assert.True(process.HasExited);
-        Assert.Equal(130, process.ExitCode);
+        Assert.Equal(0, process.ExitCode);
     }
 
     [DllImport("libc", SetLastError = true)]
     internal static extern int kill(int pid, int sig);
+
+    private sealed class TestClientTransport(ITransport sessionTransport) : IClientTransport
+    {
+        public Task<ITransport> ConnectAsync(CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(sessionTransport);
+        }
+    }
 }