1f1fa9a87e
- HOST_INTERPRETER_KILL_REJECTION is one constant in cron/lifecycle_guard; terminal_tool_guards and the execute_code lifecycle guard both use it, so an image-name kill inside a cell now names the proc_* / explicit-PID route instead of the generic "cannot restart or stop the gateway" text. One invariant test with the generic path as control. - gateway/restart.is_supervised_gateway_launch: the callee already maps None to os.environ; pass environ straight through.
46 lines
2.2 KiB
Python
46 lines
2.2 KiB
Python
"""execute_code's gateway-lifecycle identity probe shares the cell deadline (#111922).
|
|
|
|
The same ``_is_supervised_gateway_process`` probe that wedged ``terminal_tool`` runs
|
|
ahead of every ``execute_code`` cell; a probe that renders no verdict must fail closed
|
|
within the deadline instead of holding the tool call (and its cron slot) forever.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import time
|
|
|
|
import tools.code_execution_tool as cet
|
|
import tools.terminal_tool as terminal_module
|
|
|
|
|
|
def test_wedged_lifecycle_probe_returns_bounded_error_without_running(monkeypatch):
|
|
import tools.process_registry as process_registry
|
|
|
|
monkeypatch.setattr(cet, "SANDBOX_AVAILABLE", True)
|
|
monkeypatch.setattr(cet, "_load_config", lambda: {"timeout": 0.05})
|
|
monkeypatch.setattr(terminal_module, "_PRE_EXEC_GUARD_MIN_TIMEOUT_S", 0)
|
|
monkeypatch.setattr(process_registry, "_is_supervised_gateway_process", lambda: time.sleep(1))
|
|
ran: list[str] = []
|
|
monkeypatch.setattr(cet, "_get_env_config", lambda: ran.append("env") or {"env_type": "local"}, raising=False)
|
|
|
|
start = time.monotonic()
|
|
result = json.loads(cet.execute_code("print('hi')"))
|
|
elapsed = time.monotonic() - start
|
|
|
|
assert elapsed < 0.5, f"lifecycle probe wedged execute_code for {elapsed:.2f}s"
|
|
assert "did not finish" in result["error"]
|
|
assert ran == [], "a probe with no verdict must not fail open into execution"
|
|
|
|
|
|
def test_interpreter_kill_in_execute_code_names_the_owned_process_route(monkeypatch):
|
|
"""Sibling surface of the terminal guard (#113667): an image-name kill inside a cell gets the same
|
|
proc_* / explicit-PID rejection, not the generic lifecycle text."""
|
|
import tools.process_registry as process_registry
|
|
|
|
monkeypatch.setattr(process_registry, "_is_supervised_gateway_process", lambda: True)
|
|
result = json.loads(cet.execute_code('import subprocess; subprocess.run(["pkill", "-9", "python3"])'))
|
|
assert "proc_" in result["error"] and "explicit PID" in result["error"]
|
|
generic = json.loads(cet.execute_code('import os; os.system("hermes gateway restart")'))
|
|
assert "proc_" not in generic["error"] and "cannot restart or stop the gateway" in generic["error"]
|