From ddd3b78ed1bcd4700f983662dd3de0dd67f44cde Mon Sep 17 00:00:00 2001
From: Xubin Ren <52506698+Re-bin@users.noreply.github.com>
Date: Mon, 17 Aug 2026 03:46:51 +0800
Subject: [PATCH] test(ci): isolate cross-platform gateway lifecycle

---
 tests/cli/test_commands.py    | 8 +++++++-
 tests/gateway/test_runtime.py | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/cli/test_commands.py b/tests/cli/test_commands.py
index aaf1f4d5e..b72dadbe7 100644
--- a/tests/cli/test_commands.py
+++ b/tests/cli/test_commands.py
@@ -2523,9 +2523,15 @@ def test_webui_foreground_attaches_to_existing_managed_gateway(monkeypatch, tmp_
         def __init__(self, **kwargs) -> None:
             seen["runtime_kwargs"] = kwargs
             self.paths = kwargs["paths"]
+            self.status_calls = 0
 
         def status(self):
-            return SimpleNamespace(running=True)
+            self.status_calls += 1
+            # The command checks during config refresh and once more before
+            # delegating to the attach helper.
+            # If that helper is not patched as intended, make its polling loop
+            # terminate instead of hanging the Windows test worker forever.
+            return SimpleNamespace(running=self.status_calls <= 2)
 
         def start_background(self, options):
             return SimpleNamespace(
diff --git a/tests/gateway/test_runtime.py b/tests/gateway/test_runtime.py
index bad0feb41..cb24e5e5d 100644
--- a/tests/gateway/test_runtime.py
+++ b/tests/gateway/test_runtime.py
@@ -276,6 +276,8 @@ def test_restart_does_not_detach_a_foreground_gateway(tmp_path, monkeypatch):
 
 def test_last_interactive_client_stops_an_on_demand_gateway(tmp_path, monkeypatch):
     runtime = GatewayRuntime(paths=_paths(tmp_path), platform_name="Linux")
+    monkeypatch.setattr(runtime, "_process_identity", lambda pid: pid)
+    monkeypatch.setattr(runtime, "_is_pid_running", lambda _pid: True)
     stopped: list[int] = []
 
     def stop(*, timeout_s: int):
@@ -327,6 +329,8 @@ def test_on_demand_lifetime_is_recorded_before_the_gateway_spawns(tmp_path, monk
 
 def test_explicit_background_gateway_survives_the_last_client(tmp_path, monkeypatch):
     runtime = GatewayRuntime(paths=_paths(tmp_path), platform_name="Linux")
+    monkeypatch.setattr(runtime, "_process_identity", lambda pid: pid)
+    monkeypatch.setattr(runtime, "_is_pid_running", lambda _pid: True)
     stopped: list[int] = []
     monkeypatch.setattr(
         runtime,
@@ -346,6 +350,8 @@ def test_explicit_background_gateway_survives_the_last_client(tmp_path, monkeypa
 
 def test_failed_last_client_shutdown_remains_retryable(tmp_path, monkeypatch):
     runtime = GatewayRuntime(paths=_paths(tmp_path), platform_name="Linux")
+    monkeypatch.setattr(runtime, "_process_identity", lambda pid: pid)
+    monkeypatch.setattr(runtime, "_is_pid_running", lambda _pid: True)
     monkeypatch.setattr(
         runtime,
         "stop",
@@ -466,7 +472,7 @@ def test_posix_process_identity_includes_start_time_and_accepts_legacy_state(
     monkeypatch,
 ):
     runtime = GatewayRuntime(paths=_paths(tmp_path), platform_name="Linux")
-    monkeypatch.setattr("nanobot.process_runtime.os.getpgid", lambda _pid: 42)
+    monkeypatch.setattr("nanobot.process_runtime.os.getpgid", lambda _pid: 42, raising=False)
     monkeypatch.setattr(runtime, "_posix_process_started_at", lambda _pid: "987654")
 
     assert runtime.process_identity(12345) == "42:987654"