test(mcp): absorb watcher-consumer and fail-open liveness cases from #94521/#94661
Apply-ready delta distilled by @andrexibiza: deterministic watcher-consumer tests (watcher times out while a child is alive, resolves when all are dead), psutil-unavailable fail-open pin, and probe-failure fail-open handling in _stdio_children_dead (unknown is never proof that every child exited). Local: 8 passed on tests/tools/test_mcp_stdio_children_dead.py
This commit is contained in:
@@ -1,13 +1,20 @@
|
||||
"""Regression tests for ``_stdio_children_dead`` (#94335).
|
||||
"""Regression tests for MCP stdio aggregate liveness (#94335 / #94637).
|
||||
|
||||
The liveness check was inverted: the loop returned True ("all children dead")
|
||||
on the first LIVE pid, so the #81995 pre-call fast-fail raised
|
||||
``TimeoutError: MCP stdio subprocess ... has exited`` for every tools/call in
|
||||
oneshot (-z) sessions even though the subprocess was demonstrably alive.
|
||||
The #81995 fast-fail gate consumes ``_stdio_children_dead`` as a boolean
|
||||
state machine: True means every tracked child is gone; False means at least
|
||||
one child is alive or liveness is unknown. The live-child branch was inverted,
|
||||
so healthy stdio RPCs were cancelled while their subprocesses were still alive.
|
||||
|
||||
Watcher-consumer cases are distilled from #94521. Dependency/probe fail-open
|
||||
cases are distilled from #94661 into the canonical #94339 carrier.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import builtins
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
|
||||
from tools.mcp_tool import MCPServerTask
|
||||
|
||||
|
||||
@@ -39,3 +46,49 @@ def test_no_captured_pids_stays_fail_open():
|
||||
"""Unknown (no tracked pids / HTTP transport) must not fail fast."""
|
||||
assert _task_with_pids([])._stdio_children_dead() is False
|
||||
assert _task_with_pids([1], http=True)._stdio_children_dead() is False
|
||||
|
||||
|
||||
def test_psutil_unavailable_stays_fail_open():
|
||||
"""Missing probe support is unknown, never proof of child death."""
|
||||
real_import = builtins.__import__
|
||||
|
||||
def _without_psutil(name, *args, **kwargs):
|
||||
if name == "psutil":
|
||||
raise ImportError("psutil unavailable")
|
||||
return real_import(name, *args, **kwargs)
|
||||
|
||||
with patch("builtins.__import__", side_effect=_without_psutil):
|
||||
assert _task_with_pids([1])._stdio_children_dead() is False
|
||||
|
||||
|
||||
def test_pid_probe_error_stays_fail_open():
|
||||
"""A failed probe cannot authorize the destructive fast-fail."""
|
||||
with patch("psutil.pid_exists", side_effect=OSError("probe failed")):
|
||||
assert _task_with_pids([1])._stdio_children_dead() is False
|
||||
|
||||
|
||||
def test_watcher_does_not_resolve_while_a_child_is_alive():
|
||||
"""The watcher must not cancel an RPC while any child is still live."""
|
||||
|
||||
async def _run():
|
||||
with patch("psutil.pid_exists", return_value=True):
|
||||
with pytest.raises(asyncio.TimeoutError):
|
||||
await asyncio.wait_for(
|
||||
_task_with_pids([60634])._watch_stdio_children(),
|
||||
timeout=0.05,
|
||||
)
|
||||
|
||||
asyncio.run(_run())
|
||||
|
||||
|
||||
def test_watcher_resolves_when_all_children_are_dead():
|
||||
"""The watcher completes only when the aggregate verdict is all-dead."""
|
||||
|
||||
async def _run():
|
||||
with patch("psutil.pid_exists", return_value=False):
|
||||
await asyncio.wait_for(
|
||||
_task_with_pids([111, 222])._watch_stdio_children(),
|
||||
timeout=0.1,
|
||||
)
|
||||
|
||||
asyncio.run(_run())
|
||||
|
||||
+13
-11
@@ -2994,18 +2994,20 @@ class MCPServerTask:
|
||||
pids = getattr(self, "_stdio_child_pids", None)
|
||||
if not pids or self._is_http():
|
||||
return False
|
||||
for pid in pids:
|
||||
# windows-footgun: ok — psutil.pid_exists handles Windows; the
|
||||
# os.kill probe below only runs when psutil is unavailable.
|
||||
try:
|
||||
import psutil
|
||||
|
||||
if not psutil.pid_exists(pid):
|
||||
continue # this one is dead
|
||||
return False # at least one child alive (signal permission
|
||||
# irrelevant for liveness) — inverting this fail-fasted every
|
||||
# stdio call in oneshot (-z) sessions while the subprocess was
|
||||
# demonstrably alive (#94335)
|
||||
return True
|
||||
except ImportError:
|
||||
return False # unknown → don't fail fast
|
||||
for pid in pids:
|
||||
# pid_exists handles Windows without signal-permission noise; a
|
||||
# probe failure is unknown, not proof that every child exited.
|
||||
try:
|
||||
alive = psutil.pid_exists(pid)
|
||||
except Exception:
|
||||
return False # unknown → don't fail fast
|
||||
if alive:
|
||||
return False # at least one child alive → not all dead
|
||||
return True # every tracked child has exited
|
||||
|
||||
async def _watch_stdio_children(self) -> None:
|
||||
"""Poll child liveness while a stdio RPC is in flight (#81995).
|
||||
|
||||
Reference in New Issue
Block a user