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.
34 lines
1.5 KiB
Python
34 lines
1.5 KiB
Python
"""Fast-path fixtures shared across tests/agent/.
|
|
|
|
Many tests in this directory exercise the retry/backoff paths in the
|
|
agent loop. Production code uses ``jittered_backoff(base_delay=5.0)``
|
|
with a ``while time.time() < sleep_end`` loop — a single retry test
|
|
spends 5+ seconds of real wall-clock time on backoff waits.
|
|
|
|
Mocking ``jittered_backoff`` to return 0.0 collapses the while-loop
|
|
to a no-op (``time.time() < time.time() + 0`` is false immediately),
|
|
which handles the most common case without touching ``time.sleep``.
|
|
|
|
We deliberately DO NOT mock ``time.sleep`` here — some tests
|
|
(test_interrupt_propagation, test_primary_runtime_restore, etc.) use
|
|
the real ``time.sleep`` for threading coordination or assert that it
|
|
was called with specific values. Tests that want to additionally
|
|
fast-path direct ``time.sleep(N)`` calls in production code should
|
|
monkeypatch ``run_agent.time.sleep`` locally (see
|
|
``test_anthropic_error_handling.py`` for the pattern).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _fast_retry_backoff(monkeypatch):
|
|
"""Short-circuit retry backoff for all tests in this directory."""
|
|
# The agent.turn_* retry paths import ``jittered_backoff`` lazily from
|
|
# ``agent.retry_utils``; patch it there so rate-limit / invalid-response /
|
|
# server-error retries don't burn real wall-clock seconds.
|
|
from agent import retry_utils as _retry_utils
|
|
monkeypatch.setattr(_retry_utils, "jittered_backoff", lambda *a, **k: 0.0)
|