mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-30 19:09:28 +00:00
39975613b1
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
91 lines
3.7 KiB
Python
91 lines
3.7 KiB
Python
from types import SimpleNamespace
|
|
from unittest.mock import Mock
|
|
|
|
import pytest
|
|
|
|
import gateway.run as gateway_run
|
|
|
|
|
|
class _ExitCalled(Exception):
|
|
def __init__(self, code: int):
|
|
super().__init__(code)
|
|
self.code = code
|
|
|
|
|
|
def _raise_exit(code: int) -> None:
|
|
raise _ExitCalled(code)
|
|
|
|
|
|
def test_main_terminates_via_os_exit_not_systemexit(monkeypatch):
|
|
"""The terminating call must be os._exit, NOT sys.exit — SystemExit is
|
|
exactly what triggers the Py_FinalizeEx non-daemon-thread join hang this
|
|
fixes (#53107). If main() ever regresses to sys.exit(), SystemExit would
|
|
propagate instead of our os._exit sentinel and this test would fail.
|
|
|
|
Test contributed by @AgenticSpark (PR #53122, duplicate of #53121)."""
|
|
async def fake_start_gateway(config=None):
|
|
return False
|
|
|
|
stdout = SimpleNamespace(flush=Mock())
|
|
stderr = SimpleNamespace(flush=Mock())
|
|
|
|
monkeypatch.setattr(gateway_run, "start_gateway", fake_start_gateway)
|
|
monkeypatch.setattr(gateway_run.os, "_exit", _raise_exit)
|
|
monkeypatch.setattr(gateway_run.sys, "argv", ["gateway.run"])
|
|
monkeypatch.setattr(gateway_run.sys, "stdout", stdout)
|
|
monkeypatch.setattr(gateway_run.sys, "stderr", stderr)
|
|
|
|
# Our os._exit sentinel must be what terminates main() — not SystemExit.
|
|
with pytest.raises(_ExitCalled):
|
|
gateway_run.main()
|
|
|
|
|
|
def test_main_routes_systemexit_through_os_exit(monkeypatch):
|
|
"""start_gateway raises SystemExit on the clean-fatal-config (#51228),
|
|
planned-restart, and service-restart paths. main() must catch it and route
|
|
the carried code through os._exit too, so those paths are equally wedge-proof
|
|
(#53107) — a SystemExit propagating to interpreter finalization would join a
|
|
stuck non-daemon worker and hang. Verifies the explicit code (e.g. 78) is
|
|
preserved through the os._exit backstop."""
|
|
async def fake_start_gateway(config=None):
|
|
raise SystemExit(78)
|
|
|
|
stdout = SimpleNamespace(flush=Mock())
|
|
stderr = SimpleNamespace(flush=Mock())
|
|
|
|
monkeypatch.setattr(gateway_run, "start_gateway", fake_start_gateway)
|
|
monkeypatch.setattr(gateway_run.os, "_exit", _raise_exit)
|
|
monkeypatch.setattr(gateway_run.sys, "argv", ["gateway.run"])
|
|
monkeypatch.setattr(gateway_run.sys, "stdout", stdout)
|
|
monkeypatch.setattr(gateway_run.sys, "stderr", stderr)
|
|
|
|
with pytest.raises(_ExitCalled) as exc_info:
|
|
gateway_run.main()
|
|
|
|
# The SystemExit(78) must be converted to os._exit(78), not propagated.
|
|
assert exc_info.value.code == 78
|
|
stdout.flush.assert_called_once_with()
|
|
stderr.flush.assert_called_once_with()
|
|
|
|
|
|
def test_exit_backstop_releases_pid_file_and_runtime_lock(monkeypatch):
|
|
"""os._exit bypasses atexit, and the early SystemExit exit paths never run
|
|
_stop_impl — so the force-exit backstop itself must release the PID file and
|
|
runtime lock, or those early paths (#51228 fatal-config) would leak them.
|
|
Both releases are idempotent, so this is safe on every exit path."""
|
|
from gateway import status as gateway_status
|
|
|
|
remove_pid = Mock()
|
|
release_lock = Mock()
|
|
monkeypatch.setattr(gateway_status, "remove_pid_file", remove_pid)
|
|
monkeypatch.setattr(gateway_status, "release_gateway_runtime_lock", release_lock)
|
|
monkeypatch.setattr(gateway_run.os, "_exit", _raise_exit)
|
|
monkeypatch.setattr(gateway_run.sys, "stdout", SimpleNamespace(flush=Mock()))
|
|
monkeypatch.setattr(gateway_run.sys, "stderr", SimpleNamespace(flush=Mock()))
|
|
|
|
with pytest.raises(_ExitCalled) as exc_info:
|
|
gateway_run._exit_after_graceful_shutdown(78)
|
|
|
|
assert exc_info.value.code == 78
|
|
remove_pid.assert_called_once_with()
|
|
release_lock.assert_called_once_with()
|