teknium1
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.
41 lines
1.6 KiB
Python
41 lines
1.6 KiB
Python
"""Regression guard: a genuine Nous 429 must re-enter the retry loop so the
|
|
top-of-loop Nous rate-limit guard can activate the fallback chain.
|
|
|
|
Bug (found in the #44061 audit): the genuine-rate-limit branch in
|
|
``agent/conversation_loop.py`` set ``retry_count = max_retries`` then
|
|
``continue``-d, intending the top-of-loop guard to "handle fallback or bail
|
|
cleanly". But the loop condition is ``while retry_count < max_retries`` —
|
|
setting retry_count equal to max_retries makes the condition False
|
|
immediately, so the guard NEVER runs. No fallback activation, no clean
|
|
rate-limit message: the turn dies with the generic retry-exhaustion error.
|
|
|
|
The fix sets ``retry_count = max(0, max_retries - 1)`` so the loop body runs
|
|
exactly once more: the guard sees the breaker state recorded by
|
|
``record_nous_rate_limit()`` moments earlier and either activates a fallback
|
|
provider (resetting retry_count) or returns the explicit rate-limit failure.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import inspect
|
|
import re
|
|
|
|
|
|
def _loop_reenters(retry_count: int, max_retries: int) -> bool:
|
|
"""Mirror of the ``while retry_count < max_retries`` loop condition."""
|
|
return retry_count < max_retries
|
|
|
|
|
|
class TestGenuineNous429ReentersLoop:
|
|
"""The assignment used by the genuine-429 branch must leave the loop
|
|
condition True so the top-of-loop guard gets a chance to run."""
|
|
|
|
def test_fixed_assignment_reenters_for_typical_max_retries(self):
|
|
for max_retries in (1, 2, 3, 5, 10):
|
|
retry_count = max(0, max_retries - 1)
|
|
assert _loop_reenters(retry_count, max_retries), (
|
|
f"max_retries={max_retries}: guard would never run"
|
|
)
|
|
|
|
|
|
|