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.
84 lines
3.2 KiB
Python
84 lines
3.2 KiB
Python
"""Regression test for #26145: credential pool rotation after interrupt-resume.
|
|
|
|
When has_retried_429 is lost (user cancels between 429s), the pool should
|
|
still rotate if the current credential is already marked exhausted.
|
|
"""
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from agent.credential_pool import PooledCredential, STATUS_EXHAUSTED
|
|
from agent.error_classifier import FailoverReason
|
|
|
|
|
|
def _make_entry(idx, **overrides):
|
|
defaults = dict(
|
|
provider="test-provider",
|
|
id=f"cred-{idx}",
|
|
label=f"Credential {idx}",
|
|
auth_type="api_key",
|
|
priority=idx,
|
|
source="manual",
|
|
access_token=f"key-{idx}",
|
|
)
|
|
defaults.update(overrides)
|
|
return PooledCredential(**defaults)
|
|
|
|
|
|
def _make_pool(entries):
|
|
pool = MagicMock()
|
|
pool.entries = MagicMock(return_value=entries)
|
|
pool.current.return_value = entries[0]
|
|
# Must be set explicitly — MagicMock.provider returns a truthy
|
|
# child mock, which would trigger the provider-mismatch guard.
|
|
pool.provider = ""
|
|
return pool
|
|
|
|
|
|
def test_rotate_immediately_when_credential_already_exhausted():
|
|
"""If current credential has last_status='exhausted', rotate on first 429
|
|
instead of retrying (Option A fix for #26145)."""
|
|
entries = [_make_entry(0, last_status=STATUS_EXHAUSTED, last_error_code=429), _make_entry(1)]
|
|
pool = _make_pool(entries)
|
|
pool.mark_exhausted_and_rotate.return_value = entries[1]
|
|
|
|
from run_agent import AIAgent
|
|
with patch("model_tools.get_tool_definitions", return_value=[]), patch("model_tools.check_toolset_requirements", return_value={}), patch("agent.process_bootstrap.OpenAI"):
|
|
agent = MagicMock(spec=AIAgent)
|
|
agent._credential_pool = pool
|
|
agent._swap_credential = MagicMock()
|
|
recovered, retried = AIAgent._recover_with_credential_pool(
|
|
agent,
|
|
status_code=429,
|
|
has_retried_429=False, # Key: False on first 429 after interrupt
|
|
classified_reason=FailoverReason.rate_limit,
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retried is False
|
|
pool.mark_exhausted_and_rotate.assert_called_once()
|
|
agent._swap_credential.assert_called_once_with(entries[1])
|
|
|
|
|
|
|
|
|
|
def test_rotate_on_second_429_when_not_exhausted():
|
|
"""When credential is active and this is the second 429, rotate (existing behavior)."""
|
|
entries = [_make_entry(0, last_status=None), _make_entry(1)]
|
|
pool = _make_pool(entries)
|
|
pool.mark_exhausted_and_rotate.return_value = entries[1]
|
|
|
|
from run_agent import AIAgent
|
|
with patch("model_tools.get_tool_definitions", return_value=[]), patch("model_tools.check_toolset_requirements", return_value={}), patch("agent.process_bootstrap.OpenAI"):
|
|
agent = MagicMock(spec=AIAgent)
|
|
agent._credential_pool = pool
|
|
agent._swap_credential = MagicMock()
|
|
recovered, retried = AIAgent._recover_with_credential_pool(
|
|
agent,
|
|
status_code=429,
|
|
has_retried_429=True, # Second 429
|
|
classified_reason=FailoverReason.rate_limit,
|
|
)
|
|
|
|
assert recovered is True
|
|
assert retried is False
|
|
pool.mark_exhausted_and_rotate.assert_called_once()
|