From cfab972025d9392aebc7a5e8c9462bd900a948cb Mon Sep 17 00:00:00 2001
From: Bolin_Chen <17506219+bobbyfine@users.noreply.github.com>
Date: Sun, 30 Aug 2026 00:54:26 -0700
Subject: [PATCH] test(mcp-gateway): scope stop and kill paths by platform

---
 test/test_stop_kill_cancel.py | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/test/test_stop_kill_cancel.py b/test/test_stop_kill_cancel.py
index 54613476078..f3a8865a53d 100644
--- a/test/test_stop_kill_cancel.py
+++ b/test/test_stop_kill_cancel.py
@@ -19,8 +19,10 @@
 
 import pytest
 
+from kiro_crew import platform_compat as pc
 from kiro_crew.mcp_gateway import abort as abort_mod
 from kiro_crew.mcp_gateway import gatewayd as gw
+from kiro_crew.mcp_gateway import transport
 from kiro_crew.mcp_gateway.backend import Backend, _PendingRequest
 from kiro_crew.mcp_gateway.pool import BackendPool, PoolKey
 
@@ -163,6 +165,10 @@ async def test_cancel_skips_when_backend_dead(self):
 class TestRecycleIfIdle:
     """Tests for Backend.recycle_if_idle."""
 
+    @pytest.mark.skipif(
+        pc.IS_WINDOWS,
+        reason="asserts POSIX killpg path; Windows uses taskkill /T",
+    )
     @pytest.mark.asyncio
     async def test_recycle_kills_when_refcount_zero(self):
         """refcount 0 → SIGKILL the backend."""
@@ -191,13 +197,20 @@ async def test_recycle_quarantines_when_co_tenants(self):
         backend = _make_mock_backend()
         backend.refcount = 2
 
-        with patch("os.killpg") as mock_killpg:
+        with patch(
+            "kiro_crew.platform_compat.kill_process_tree_async",
+            new_callable=AsyncMock,
+        ) as mock_kill_tree:
             result = await backend.recycle_if_idle()
 
         assert result is False
         assert backend.quarantined is True
-        mock_killpg.assert_not_called()
+        mock_kill_tree.assert_not_awaited()
 
+    @pytest.mark.skipif(
+        pc.IS_WINDOWS,
+        reason="asserts POSIX init PID 1 guard; Windows uses taskkill",
+    )
     @pytest.mark.asyncio
     async def test_recycle_guards_against_pid_1(self):
         """Never kill PID 1 (init)."""
@@ -260,13 +273,14 @@ async def test_recycle_awaits_async_tree_kill_not_sync(self):
                 side_effect=self._forbid_sync,
             ),
             # os.killpg/os.getpgid must not be reached directly any more.
-            patch("os.killpg", side_effect=self._forbid_sync),
+            patch("os.getpgid", side_effect=self._forbid_sync, create=True),
+            patch("os.killpg", side_effect=self._forbid_sync, create=True),
         ):
             result = await backend.recycle_if_idle()
 
         assert result is True
         assert mock_async.await_count == 1
-        assert mock_async.await_args.args == (pid, signal.SIGKILL)
+        assert mock_async.await_args.args == (pid, pc.SIGKILL)
 
     @pytest.mark.asyncio
     async def test_shutdown_escalation_awaits_async_tree_kill_not_sync(self):
@@ -283,12 +297,13 @@ async def test_shutdown_escalation_awaits_async_tree_kill_not_sync(self):
                 "kiro_crew.platform_compat.kill_process_tree",
                 side_effect=self._forbid_sync,
             ),
-            patch("os.killpg", side_effect=self._forbid_sync),
+            patch("os.getpgid", side_effect=self._forbid_sync, create=True),
+            patch("os.killpg", side_effect=self._forbid_sync, create=True),
         ):
             await backend.shutdown(timeout=0.01)
 
         assert mock_async.await_count == 1
-        assert mock_async.await_args.args[1] == signal.SIGKILL
+        assert mock_async.await_args.args[1] == pc.SIGKILL
 
     @pytest.mark.asyncio
     async def test_shutdown_falls_back_to_process_kill_when_tree_kill_fails(self):
@@ -419,7 +434,8 @@ def _forbid_sync(*_a: Any, **_kw: Any) -> None:
                 "kiro_crew.platform_compat.kill_process_tree",
                 side_effect=_forbid_sync,
             ),
-            patch("os.killpg", side_effect=_forbid_sync),
+            patch("os.getpgid", side_effect=_forbid_sync, create=True),
+            patch("os.killpg", side_effect=_forbid_sync, create=True),
         ):
             await manager._reap_orphaned_backends()
 
@@ -766,7 +782,7 @@ async def _fake_gatewayd(reader, writer):
             await writer.drain()
             writer.close()
 
-        server = await asyncio.start_unix_server(_fake_gatewayd, path=socket_path)
+        server = await transport.serve(socket_path, _fake_gatewayd, limit=1 << 16)
         try:
             with caplog.at_level(logging.INFO, logger=abort_mod.logger.name):
                 resp = await abort_mod.send_abort(socket_path, [100], "test stop")
@@ -791,7 +807,7 @@ async def _fake_gatewayd(reader, writer):
             await writer.drain()
             writer.close()
 
-        server = await asyncio.start_unix_server(_fake_gatewayd, path=socket_path)
+        server = await transport.serve(socket_path, _fake_gatewayd, limit=1 << 16)
         try:
             with caplog.at_level(logging.WARNING, logger=abort_mod.logger.name):
                 resp = await abort_mod.send_abort(socket_path, [100], "test stop")