mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-30 19:09:28 +00:00
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.
162 lines
6.2 KiB
Python
162 lines
6.2 KiB
Python
"""Regression tests for _release_running_agent_state and SessionDB shutdown.
|
|
|
|
Before this change, running-agent state lived in three dicts that drifted
|
|
out of sync:
|
|
|
|
self._running_agents — AIAgent instance per session key
|
|
self._running_agents_ts — start timestamp per session key
|
|
self._busy_ack_ts — last busy-ack timestamp per session key
|
|
|
|
Six cleanup sites did ``del self._running_agents[key]`` without touching
|
|
the other two; one site only popped ``_running_agents`` and
|
|
``_running_agents_ts``; and only the stale-eviction site cleaned all
|
|
three. Each missed entry was a small persistent leak.
|
|
|
|
Also: SessionDB connections were never closed on gateway shutdown,
|
|
leaving WAL locks in place until Python actually exited.
|
|
"""
|
|
|
|
import threading
|
|
from unittest.mock import MagicMock
|
|
|
|
|
|
def _make_runner():
|
|
"""Bare GatewayRunner wired with just the state the helper touches."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = GatewayRunner.__new__(GatewayRunner)
|
|
runner._running_agents = {}
|
|
runner._running_agents_ts = {}
|
|
runner._busy_ack_ts = {}
|
|
return runner
|
|
|
|
|
|
class TestReleaseRunningAgentStateUnit:
|
|
def test_pops_all_three_dicts(self):
|
|
runner = _make_runner()
|
|
runner._running_agents["k"] = MagicMock()
|
|
runner._running_agents_ts["k"] = 123.0
|
|
runner._busy_ack_ts["k"] = 456.0
|
|
|
|
runner._release_running_agent_state("k")
|
|
|
|
assert "k" not in runner._running_agents
|
|
assert "k" not in runner._running_agents_ts
|
|
assert "k" not in runner._busy_ack_ts
|
|
|
|
def test_idempotent_on_missing_key(self):
|
|
"""Calling twice (or on an absent key) must not raise."""
|
|
runner = _make_runner()
|
|
runner._release_running_agent_state("missing")
|
|
runner._release_running_agent_state("missing") # still fine
|
|
|
|
|
|
class TestNoMoreBareDeleteSites:
|
|
"""Regression: all bare `del self._running_agents[key]` sites were
|
|
converted to use the helper. If a future contributor reverts one,
|
|
this test flags it. Docstrings / comments mentioning the old
|
|
pattern are allowed.
|
|
"""
|
|
|
|
def test_no_bare_del_of_running_agents_in_gateway_run(self):
|
|
from pathlib import Path
|
|
import re
|
|
|
|
gateway_run = (Path(__file__).parent.parent.parent / "gateway" / "run.py").read_text()
|
|
# Match `del self._running_agents[...]` that is NOT inside a
|
|
# triple-quoted docstring. We scan non-docstring lines only.
|
|
lines = gateway_run.splitlines()
|
|
|
|
in_docstring = False
|
|
docstring_delim = None
|
|
offenders = []
|
|
for idx, line in enumerate(lines, start=1):
|
|
stripped = line.strip()
|
|
if not in_docstring:
|
|
if stripped.startswith('"""') or stripped.startswith("'''"):
|
|
delim = stripped[:3]
|
|
# single-line docstring?
|
|
if stripped.count(delim) >= 2:
|
|
continue
|
|
in_docstring = True
|
|
docstring_delim = delim
|
|
continue
|
|
if re.search(r"\bdel\s+self\._running_agents\[", line):
|
|
offenders.append((idx, line.rstrip()))
|
|
else:
|
|
if docstring_delim and docstring_delim in stripped:
|
|
in_docstring = False
|
|
docstring_delim = None
|
|
|
|
assert offenders == [], (
|
|
"Found bare `del self._running_agents[...]` sites in gateway/run.py. "
|
|
"Use self._release_running_agent_state(session_key) instead so "
|
|
"_running_agents_ts and _busy_ack_ts are popped in lockstep.\n"
|
|
+ "\n".join(f" line {n}: {l}" for n, l in offenders)
|
|
)
|
|
|
|
|
|
class TestSessionDbCloseOnShutdown:
|
|
"""_stop_impl should call .close() on both self._session_db and
|
|
self.session_store._db to release SQLite WAL locks before the new
|
|
gateway (during --replace restart) tries to open the same file.
|
|
"""
|
|
|
|
|
|
def test_shutdown_tolerates_close_raising(self):
|
|
"""A close() that raises must not prevent subsequent cleanup."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = GatewayRunner.__new__(GatewayRunner)
|
|
flaky_db = MagicMock()
|
|
flaky_db.close.side_effect = RuntimeError("simulated lock error")
|
|
healthy_db = MagicMock()
|
|
|
|
runner._db = flaky_db
|
|
runner.session_store = MagicMock()
|
|
runner.session_store._db = healthy_db
|
|
|
|
# Same pattern as production: try/except around each close().
|
|
for _db_holder in (runner, getattr(runner, "session_store", None)):
|
|
_db = getattr(_db_holder, "_db", None) if _db_holder else None
|
|
if _db is None or not hasattr(_db, "close"):
|
|
continue
|
|
try:
|
|
_db.close()
|
|
except Exception:
|
|
pass
|
|
|
|
flaky_db.close.assert_called_once()
|
|
healthy_db.close.assert_called_once()
|
|
|
|
|
|
class TestSessionResetZombieRace:
|
|
"""Regression for #28686 — a session_reset racing the in-flight run's
|
|
guarded release must not leave a dead agent locking the slot forever.
|
|
"""
|
|
|
|
def test_generation_guard_blocks_then_unconditional_release_evicts(self):
|
|
runner = _make_runner()
|
|
runner._session_run_generation = {}
|
|
key = "agent:main:telegram:private:1"
|
|
|
|
gen_n = runner._begin_session_run_generation(key)
|
|
dead_agent = MagicMock()
|
|
runner._running_agents[key] = dead_agent
|
|
runner._running_agents_ts[key] = 1.0
|
|
runner._busy_ack_ts[key] = 1.0
|
|
|
|
# session_reset bumps the generation while gen-N is still in flight.
|
|
runner._invalidate_session_run_generation(key, reason="session_reset")
|
|
|
|
# gen-N's own guarded release is correctly blocked — slot would be a
|
|
# zombie if nothing else cleared it (the pre-fix behaviour).
|
|
assert runner._release_running_agent_state(key, run_generation=gen_n) is False
|
|
assert runner._running_agents.get(key) is dead_agent
|
|
|
|
# The fix: unconditional release (no run_generation) always clears it.
|
|
assert runner._release_running_agent_state(key) is True
|
|
assert key not in runner._running_agents
|
|
assert key not in runner._running_agents_ts
|
|
assert key not in runner._busy_ack_ts
|
|
|