mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +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.
107 lines
3.6 KiB
Python
107 lines
3.6 KiB
Python
"""Tests for /proc-based gateway PID detection in Docker environments.
|
|
|
|
Verifies that _scan_gateway_pids() uses /proc/*/cmdline when available
|
|
(Docker without procps) and falls back to ps only when /proc is absent.
|
|
|
|
See: NousResearch/hermes-agent#7622
|
|
"""
|
|
|
|
import os
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import hermes_cli.gateway as gateway_mod
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helpers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
_GATEWAY_CMD = "python -m hermes_cli.main gateway run"
|
|
_OTHER_CMD = "python -m some_other_thing"
|
|
|
|
|
|
def _fake_proc_dir(entries: dict):
|
|
"""Return side_effects that simulate /proc: isdir → True, listdir → pids,
|
|
open(cmdline) → null-delimited command bytes."""
|
|
def _isdir(path):
|
|
return str(path) == "/proc"
|
|
|
|
def _listdir(path):
|
|
if str(path) == "/proc":
|
|
return [str(pid) for pid in entries] + ["self", "version"]
|
|
raise FileNotFoundError(path)
|
|
|
|
def _open(path, mode="r", **kwargs):
|
|
path_str = str(path)
|
|
if "/cmdline" in path_str:
|
|
pid = int(path_str.split("/proc/")[1].split("/")[0])
|
|
raw = entries.get(pid, "").encode("utf-8").replace(b" ", b"\x00")
|
|
m = MagicMock()
|
|
m.read.return_value = raw
|
|
m.__enter__ = lambda s: s
|
|
m.__exit__ = MagicMock(return_value=False)
|
|
return m
|
|
raise FileNotFoundError(path)
|
|
|
|
return _isdir, _listdir, _open
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Tests
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestProcFallback:
|
|
"""_scan_gateway_pids reads /proc when available, skips ps."""
|
|
|
|
def test_detects_gateway_pid_via_proc(self):
|
|
my_pid = os.getpid()
|
|
entries = {
|
|
my_pid: "python -m hermes_cli.main", # own process — excluded
|
|
12345: _GATEWAY_CMD,
|
|
99999: _OTHER_CMD,
|
|
}
|
|
_isdir, _listdir, _open = _fake_proc_dir(entries)
|
|
|
|
with (
|
|
patch("hermes_cli.gateway.is_windows", return_value=False),
|
|
patch("os.path.isdir", side_effect=_isdir),
|
|
patch("os.listdir", side_effect=_listdir),
|
|
patch("builtins.open", side_effect=_open),
|
|
patch("hermes_cli.gateway._get_ancestor_pids", return_value=set()),
|
|
patch("subprocess.run") as mock_ps,
|
|
):
|
|
pids = gateway_mod._scan_gateway_pids(set(), all_profiles=True)
|
|
|
|
assert 12345 in pids
|
|
assert 99999 not in pids
|
|
mock_ps.assert_not_called() # ps must NOT be called when /proc worked
|
|
|
|
|
|
|
|
|
|
def test_proc_permission_error_skips_pid(self):
|
|
def _isdir(path):
|
|
return str(path) == "/proc"
|
|
|
|
def _listdir(path):
|
|
if str(path) == "/proc":
|
|
return ["12345", "self"]
|
|
raise FileNotFoundError
|
|
|
|
def _open(path, mode="r", **kwargs):
|
|
raise PermissionError("no access")
|
|
|
|
with (
|
|
patch("hermes_cli.gateway.is_windows", return_value=False),
|
|
patch("os.path.isdir", side_effect=_isdir),
|
|
patch("os.listdir", side_effect=_listdir),
|
|
patch("builtins.open", side_effect=_open),
|
|
patch("hermes_cli.gateway._get_ancestor_pids", return_value=set()),
|
|
patch("subprocess.run") as mock_ps,
|
|
):
|
|
pids = gateway_mod._scan_gateway_pids(set(), all_profiles=True)
|
|
|
|
# PermissionError swallowed — empty result, no crash
|
|
assert 12345 not in pids
|
|
mock_ps.assert_not_called() # /proc dir existed, so ps not called
|