d10bb2ab6f
`scripts/run_tests.sh tests/<dir>/` is how a change gets its regression
coverage run, so a test filed under the wrong directory is a test nobody
runs when that code changes. Two kinds of drift had accumulated.
Parallel directories for one source package, folded into the mirror:
tests/acp -> tests/acp_adapter (its __init__/conftest move with it)
tests/cli -> tests/hermes_cli (prompt_toolkit fixture merged into
hermes_cli/conftest.py)
tests/run_agent -> tests/agent (backoff fixture becomes
agent/conftest.py)
tests/relay -> tests/gateway/relay
tests/state -> tests/hermes_state
246 loose files at tests/ root, routed by the package they import/patch:
hermes_cli, hermes_state, agent, gateway, tools, plugins, tui_gateway, cron.
Installer and desktop-update script tests go to tests/scripts/{install,
desktop_update}/. 43 tests of root-level modules (batch_runner, utils,
hermes_constants, packaging) stay at the root.
Filenames drop their issue numbers (95 files: test_89315_x.py -> test_x.py);
the number stays in the module docstring where it has context.
Collisions: test_cli_skin_integration.py existed in both tests/ and tests/cli
with different subsets — merged into one (10 tests, all kept);
run_agent/test_pre_compress_memory_context.py -> agent/..._handoff.py;
tests/test_account_usage.py -> agent/test_account_usage_fetch.py;
tests/test_web_server.py -> hermes_cli/test_web_server_ws_ping.py.
Deleted: test_minisweagent_path.py (empty since PR #2804),
test_model_picker_scroll.py (tested a private copy of the logic, imported
nothing), test_process_loop_event_loop_warning.py (asserted asyncio behaviour,
imported nothing from Hermes).
Repo-root path arithmetic (Path(__file__).parents[N], dirname chains) is
bumped for the 202 files that changed depth and verified by evaluating every
such expression against the new location. classify_changes' desktop-updater
lane prefix, tests-os.yml's ignore glob and every in-tree path comment follow
the moves. tests/test_tests_tree_layout.py keeps the tree from drifting back.
170 lines
5.8 KiB
Python
170 lines
5.8 KiB
Python
"""Regression guard for #62151 — gateway cron must not wedge on 2nd+ API call.
|
|
|
|
Gateway-fired cron jobs hung forever on the 2nd+ non-streaming API call when
|
|
``interruptible_api_call`` spawned a daemon worker inside nested cron thread
|
|
pools. The worker logged client creation but never opened a TCP connection.
|
|
The same job succeeded via ``hermes cron tick``. Cron has no interactive
|
|
interrupt surface, so the fix routes cron through a synchronous direct call on
|
|
the conversation thread instead of the interrupt worker.
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock
|
|
|
|
from agent.chat_completion_helpers import (
|
|
direct_api_call,
|
|
should_use_direct_api_call,
|
|
)
|
|
|
|
|
|
def _make_agent(*, platform="cron"):
|
|
agent = MagicMock()
|
|
agent.platform = platform
|
|
agent.api_mode = "chat_completions"
|
|
agent.provider = "openrouter"
|
|
agent._interrupt_requested = False
|
|
agent._touch_activity = MagicMock()
|
|
agent._create_request_openai_client = MagicMock()
|
|
agent._close_request_openai_client = MagicMock()
|
|
return agent
|
|
|
|
|
|
def test_should_use_direct_api_call_only_for_cron_openai_wire():
|
|
assert should_use_direct_api_call(_make_agent(platform="cron")) is True
|
|
assert should_use_direct_api_call(_make_agent(platform="cli")) is False
|
|
assert should_use_direct_api_call(_make_agent(platform="telegram")) is False
|
|
assert should_use_direct_api_call(_make_agent(platform=None)) is False
|
|
|
|
for api_mode in ("codex_responses", "anthropic_messages", "bedrock_converse"):
|
|
agent = _make_agent(platform="cron")
|
|
agent.api_mode = api_mode
|
|
assert should_use_direct_api_call(agent) is False
|
|
|
|
moa = _make_agent(platform="cron")
|
|
moa.provider = "moa"
|
|
assert should_use_direct_api_call(moa) is False
|
|
|
|
|
|
def test_direct_api_call_runs_two_sequential_requests_on_same_thread():
|
|
"""Mirror the 2nd+ call failure mode: two back-to-back completions.create."""
|
|
agent = _make_agent()
|
|
calls = {"n": 0}
|
|
fake_client = MagicMock()
|
|
|
|
def _create(**_kwargs):
|
|
calls["n"] += 1
|
|
return fake_client
|
|
|
|
fake_client.chat.completions.create.side_effect = [
|
|
SimpleNamespace(id="first"),
|
|
SimpleNamespace(id="second"),
|
|
]
|
|
agent._create_request_openai_client.side_effect = _create
|
|
|
|
first = direct_api_call(agent, {"model": "m", "messages": []})
|
|
second = direct_api_call(agent, {"model": "m", "messages": []})
|
|
|
|
assert first.id == "first"
|
|
assert second.id == "second"
|
|
assert calls["n"] == 2
|
|
assert fake_client.chat.completions.create.call_count == 2
|
|
assert agent._close_request_openai_client.call_count == 2
|
|
|
|
|
|
def test_direct_api_call_keeps_activity_alive_during_slow_wait(monkeypatch):
|
|
"""Mid-wait activity heartbeats must tick while the inline request blocks.
|
|
|
|
Subagents use direct_api_call (non-streaming). Without mid-call
|
|
``_touch_activity`` ticks, the async stall monitor treats a slow-but-
|
|
healthy local model wait as frozen progress and interrupts around 450s
|
|
(``Operation interrupted: waiting for model response``).
|
|
"""
|
|
import threading
|
|
import time
|
|
|
|
from agent import chat_completion_helpers as helpers
|
|
|
|
monkeypatch.setattr(helpers, "_DIRECT_API_ACTIVITY_HEARTBEAT_SECONDS", 0.05)
|
|
|
|
agent = _make_agent(platform="subagent")
|
|
started = threading.Event()
|
|
release = threading.Event()
|
|
fake_client = MagicMock()
|
|
|
|
def _slow_create(**_kwargs):
|
|
started.set()
|
|
assert release.wait(timeout=2.0)
|
|
return SimpleNamespace(id="slow")
|
|
|
|
fake_client.chat.completions.create.side_effect = _slow_create
|
|
agent._create_request_openai_client.return_value = fake_client
|
|
|
|
result_box = {}
|
|
|
|
def _runner():
|
|
result_box["response"] = direct_api_call(
|
|
agent, {"model": "m", "messages": []}
|
|
)
|
|
|
|
worker = threading.Thread(target=_runner, daemon=True)
|
|
worker.start()
|
|
assert started.wait(timeout=2.0)
|
|
|
|
# Allow several heartbeat intervals while the request is still blocked.
|
|
deadline = time.time() + 1.0
|
|
while time.time() < deadline and agent._touch_activity.call_count < 3:
|
|
time.sleep(0.05)
|
|
|
|
touches_while_blocked = agent._touch_activity.call_count
|
|
release.set()
|
|
worker.join(timeout=2.0)
|
|
|
|
assert worker.is_alive() is False
|
|
assert result_box["response"].id == "slow"
|
|
assert touches_while_blocked >= 3, (
|
|
f"expected mid-wait activity heartbeats, got {touches_while_blocked}"
|
|
)
|
|
assert all(
|
|
call.args[0] == "waiting for non-streaming API response"
|
|
for call in agent._touch_activity.call_args_list
|
|
)
|
|
|
|
|
|
def test_direct_api_call_heartbeat_stops_on_exception(monkeypatch):
|
|
"""The activity heartbeat thread must be joined on error paths so no
|
|
stray _touch_activity fires after the call has failed.
|
|
"""
|
|
import threading
|
|
import time
|
|
|
|
from agent import chat_completion_helpers as helpers
|
|
|
|
monkeypatch.setattr(helpers, "_DIRECT_API_ACTIVITY_HEARTBEAT_SECONDS", 0.05)
|
|
|
|
agent = _make_agent(platform="subagent")
|
|
fake_client = MagicMock()
|
|
fake_client.chat.completions.create.side_effect = RuntimeError("provider down")
|
|
agent._create_request_openai_client.return_value = fake_client
|
|
|
|
raised = threading.Event()
|
|
|
|
def _runner():
|
|
try:
|
|
direct_api_call(agent, {"model": "m", "messages": []})
|
|
except RuntimeError:
|
|
raised.set()
|
|
|
|
worker = threading.Thread(target=_runner, daemon=True)
|
|
worker.start()
|
|
worker.join(timeout=3.0)
|
|
|
|
assert raised.is_set(), "expected RuntimeError from direct_api_call"
|
|
# Give any stray heartbeat a chance to fire after the call returned.
|
|
time.sleep(0.2)
|
|
touches_before = agent._touch_activity.call_count
|
|
time.sleep(0.2)
|
|
touches_after = agent._touch_activity.call_count
|
|
assert touches_after == touches_before, (
|
|
"heartbeat thread still firing after direct_api_call raised"
|
|
)
|