mcp: fix more flaky tests

Author: fgrosse

mcp/cmd_test.go

@@ -122,7 +122,6 @@ func TestServerRunContextCancel(t *testing.T) {
 }
 
 func TestServerInterrupt(t *testing.T) {
-	t.Skip()
 	if runtime.GOOS == "windows" {
 		t.Skip("requires POSIX signals")
 	}
@@ -134,10 +133,11 @@ func TestServerInterrupt(t *testing.T) {
 	cmd := createServerCommand(t, "default")
 
 	client := mcp.NewClient(testImpl, nil)
-	_, err := client.Connect(ctx, &mcp.CommandTransport{Command: cmd}, nil)
+	session, err := client.Connect(ctx, &mcp.CommandTransport{Command: cmd}, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
+	t.Cleanup(func() { session.Close() })
 
 	// get a signal when the server process exits
 	onExit := make(chan struct{})
@@ -208,7 +208,6 @@ func TestStdioContextCancellation(t *testing.T) {
 }
 
 func TestCmdTransport(t *testing.T) {
-	t.Skip()
 	requireExec(t)
 
 	ctx, cancel := context.WithCancel(context.Background())

mcp/mcp_test.go

@@ -464,7 +464,6 @@ func TestEndToEnd(t *testing.T) {
 	})
 
 	t.Run("resource_subscriptions", func(t *testing.T) {
-		t.Skip("TODO")
 		err := cs.Subscribe(ctx, &SubscribeParams{
 			URI: "test",
 		})

mcp/streamable_test.go

@@ -34,7 +34,6 @@ import (
 )
 
 func TestStreamableTransports(t *testing.T) {
-	t.Skip()
 	// This test checks that the streamable server and client transports can
 	// communicate.
 
@@ -271,7 +270,6 @@ func TestStreamableServerShutdown(t *testing.T) {
 // uses a proxy that is killed and restarted to simulate a recoverable network
 // outage.
 func TestClientReplay(t *testing.T) {
-	t.Skip()
 	for _, test := range []clientReplayTest{
 		{"default", 0, true},
 		{"no retries", -1, false},
@@ -344,7 +342,7 @@ func testClientReplay(t *testing.T, test clientReplayTest) {
 	if err != nil {
 		t.Fatalf("client.Connect() failed: %v", err)
 	}
-	defer clientSession.Close()
+	t.Cleanup(func() { clientSession.Close() })
 
 	var (
 		wg      sync.WaitGroup
@@ -386,7 +384,7 @@ func testClientReplay(t *testing.T, test clientReplayTest) {
 
 	restartedProxy := &http.Server{Handler: proxyHandler}
 	go restartedProxy.Serve(listener)
-	defer restartedProxy.Close()
+	t.Cleanup(func() { restartedProxy.Close() })
 
 	wg.Wait()