fix: Improve process cleanup in integration tests

- Increase join timeout from 2s to 5s
- Add fallback terminate() call for stubborn processes
- Add exception handling for cleanup edge cases

Author: spacelord16

tests/server/fastmcp/test_integration.py

@@ -80,7 +80,9 @@ def run_server_with_transport(module_name: str, port: int, transport: str) -> No
     import sys
 
     # Add examples/snippets to Python path for multiprocessing context
-    snippets_path = os.path.join(os.path.dirname(__file__), "..", "..", "..", "examples", "snippets")
+    snippets_path = os.path.join(
+        os.path.dirname(__file__), "..", "..", "..", "examples", "snippets"
+    )
     sys.path.insert(0, os.path.abspath(snippets_path))
 
     # Import the servers module in the multiprocessing context
@@ -129,7 +131,9 @@ def run_server_with_transport(module_name: str, port: int, transport: str) -> No
     else:
         raise ValueError(f"Invalid transport for test server: {transport}")
 
-    server = uvicorn.Server(config=uvicorn.Config(app=app, host="127.0.0.1", port=port, log_level="error"))
+    server = uvicorn.Server(
+        config=uvicorn.Config(app=app, host="127.0.0.1", port=port, log_level="error")
+    )
     print(f"Starting {transport} server on port {port}")
     server.run()
 
@@ -169,14 +173,22 @@ def server_transport(request, server_port: int) -> Generator[str, None, None]:
             time.sleep(delay)
             attempt += 1
     else:
-        raise RuntimeError(f"Server failed to start after {max_attempts} attempts (port {server_port})")
+        raise RuntimeError(
+            f"Server failed to start after {max_attempts} attempts (port {server_port})"
+        )
 
     yield transport
 
+    # Aggressive cleanup - kill and force terminate
     proc.kill()
-    proc.join(timeout=2)
+    proc.join(timeout=5)
     if proc.is_alive():
-        print("Server process failed to terminate")
+        print("Server process failed to terminate, force killing")
+        try:
+            proc.terminate()
+            proc.join(timeout=2)
+        except Exception:
+            pass
 
 
 # Helper function to create client based on transport
@@ -340,10 +352,14 @@ async def test_basic_prompts(server_transport: str, server_url: str) -> None:
 
             # Test review_code prompt
             prompts = await session.list_prompts()
-            review_prompt = next((p for p in prompts.prompts if p.name == "review_code"), None)
+            review_prompt = next(
+                (p for p in prompts.prompts if p.name == "review_code"), None
+            )
             assert review_prompt is not None
 
-            prompt_result = await session.get_prompt("review_code", {"code": "def hello():\n    print('Hello')"})
+            prompt_result = await session.get_prompt(
+                "review_code", {"code": "def hello():\n    print('Hello')"}
+            )
             assert isinstance(prompt_result, GetPromptResult)
             assert len(prompt_result.messages) == 1
             assert isinstance(prompt_result.messages[0].content, TextContent)
@@ -399,16 +415,18 @@ async def test_tool_progress(server_transport: str, server_url: str) -> None:
             assert result.capabilities.tools is not None
 
             # Test long_running_task tool that reports progress
-            tool_result = await session.call_tool("long_running_task", {"task_name": "test", "steps": 3})
+            tool_result = await session.call_tool(
+                "long_running_task", {"task_name": "test", "steps": 3}
+            )
             assert len(tool_result.content) == 1
             assert isinstance(tool_result.content[0], TextContent)
             assert "Task 'test' completed" in tool_result.content[0].text
 
             # Verify that progress notifications or log messages were sent
             # Progress can come through either progress notifications or log messages
-            total_notifications = len(notification_collector.progress_notifications) + len(
-                notification_collector.log_messages
-            )
+            total_notifications = len(
+                notification_collector.progress_notifications
+            ) + len(notification_collector.log_messages)
             assert total_notifications > 0
 
 
@@ -429,7 +447,9 @@ async def test_sampling(server_transport: str, server_url: str) -> None:
 
     async with client_cm as client_streams:
         read_stream, write_stream = unpack_streams(client_streams)
-        async with ClientSession(read_stream, write_stream, sampling_callback=sampling_callback) as session:
+        async with ClientSession(
+            read_stream, write_stream, sampling_callback=sampling_callback
+        ) as session:
             # Test initialization
             result = await session.initialize()
             assert isinstance(result, InitializeResult)
@@ -460,7 +480,9 @@ async def test_elicitation(server_transport: str, server_url: str) -> None:
 
     async with client_cm as client_streams:
         read_stream, write_stream = unpack_streams(client_streams)
-        async with ClientSession(read_stream, write_stream, elicitation_callback=elicitation_callback) as session:
+        async with ClientSession(
+            read_stream, write_stream, elicitation_callback=elicitation_callback
+        ) as session:
             # Test initialization
             result = await session.initialize()
             assert isinstance(result, InitializeResult)
@@ -506,7 +528,9 @@ async def test_completion(server_transport: str, server_url: str) -> None:
             assert len(prompts.prompts) > 0
 
             # Test getting a prompt
-            prompt_result = await session.get_prompt("review_code", {"language": "python", "code": "def test(): pass"})
+            prompt_result = await session.get_prompt(
+                "review_code", {"language": "python", "code": "def test(): pass"}
+            )
             assert len(prompt_result.messages) > 0
 
 
@@ -618,7 +642,9 @@ async def test_structured_output(server_transport: str, server_url: str) -> None
             assert result.serverInfo.name == "Structured Output Example"
 
             # Test get_weather tool
-            weather_result = await session.call_tool("get_weather", {"city": "New York"})
+            weather_result = await session.call_tool(
+                "get_weather", {"city": "New York"}
+            )
             assert len(weather_result.content) == 1
             assert isinstance(weather_result.content[0], TextContent)