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.
110 lines
3.6 KiB
Python
110 lines
3.6 KiB
Python
"""Regression test for TUI v2 blitz bug: explicit /model --provider switch
|
|
silently fell back to the old primary provider on the next turn because the
|
|
fallback chain — seeded from config at agent __init__ — kept entries for the
|
|
provider the user just moved away from.
|
|
|
|
Reported: "switched from openrouter provider to anthropic api key via hermes
|
|
model and the tui keeps trying openrouter".
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _make_agent(chain):
|
|
agent = AIAgent.__new__(AIAgent)
|
|
|
|
agent.provider = "openrouter"
|
|
agent.model = "x-ai/grok-4"
|
|
agent.base_url = "https://openrouter.ai/api/v1"
|
|
agent.api_key = "or-key"
|
|
agent.api_mode = "chat_completions"
|
|
agent.client = MagicMock()
|
|
agent._client_kwargs = {"api_key": "or-key", "base_url": "https://openrouter.ai/api/v1"}
|
|
agent.context_compressor = None
|
|
agent._anthropic_api_key = ""
|
|
agent._anthropic_base_url = None
|
|
agent._anthropic_client = None
|
|
agent._is_anthropic_oauth = False
|
|
agent._cached_system_prompt = "cached"
|
|
agent._primary_runtime = {}
|
|
agent._fallback_activated = False
|
|
agent._fallback_index = 0
|
|
agent._fallback_chain = list(chain)
|
|
agent._fallback_model = chain[0] if chain else None
|
|
|
|
return agent
|
|
|
|
|
|
def _switch_to_anthropic(agent):
|
|
with (
|
|
patch("agent.anthropic_adapter.build_anthropic_client", return_value=MagicMock()),
|
|
patch("agent.anthropic_credentials.resolve_anthropic_token", return_value="sk-ant-xyz"),
|
|
patch("agent.anthropic_credentials._is_oauth_token", return_value=False),
|
|
patch("hermes_cli.timeouts.get_provider_request_timeout", return_value=None),
|
|
):
|
|
agent.switch_model(
|
|
new_model="claude-sonnet-4-5",
|
|
new_provider="anthropic",
|
|
api_key="sk-ant-xyz",
|
|
base_url="https://api.anthropic.com",
|
|
api_mode="anthropic_messages",
|
|
)
|
|
|
|
|
|
def test_switch_drops_old_primary_from_fallback_chain():
|
|
agent = _make_agent([
|
|
{"provider": "openrouter", "model": "x-ai/grok-4"},
|
|
{"provider": "nous", "model": "hermes-4"},
|
|
])
|
|
|
|
_switch_to_anthropic(agent)
|
|
|
|
providers = [entry["provider"] for entry in agent._fallback_chain]
|
|
|
|
assert "openrouter" not in providers, "old primary must be pruned"
|
|
assert "anthropic" not in providers, "new primary is redundant in the chain"
|
|
assert providers == ["nous"]
|
|
assert agent._fallback_model == {"provider": "nous", "model": "hermes-4"}
|
|
|
|
|
|
def test_switch_with_empty_chain_stays_empty():
|
|
agent = _make_agent([])
|
|
|
|
_switch_to_anthropic(agent)
|
|
|
|
assert agent._fallback_chain == []
|
|
assert agent._fallback_model is None
|
|
|
|
|
|
def test_manual_switch_clears_provider_fallback_provenance():
|
|
agent = _make_agent([
|
|
{"provider": "openrouter", "model": "x-ai/grok-4"},
|
|
{"provider": "nous", "model": "hermes-4"},
|
|
])
|
|
agent._provider_fallback_active = True
|
|
agent._provider_fallback_route = ("fallback-model", "fallback-provider")
|
|
|
|
_switch_to_anthropic(agent)
|
|
|
|
assert agent._provider_fallback_active is False
|
|
assert agent._provider_fallback_route is None
|
|
|
|
|
|
|
|
|
|
def test_switch_within_same_provider_preserves_chain():
|
|
chain = [{"provider": "openrouter", "model": "x-ai/grok-4"}]
|
|
agent = _make_agent(chain)
|
|
|
|
with patch("hermes_cli.timeouts.get_provider_request_timeout", return_value=None):
|
|
agent.switch_model(
|
|
new_model="openai/gpt-5",
|
|
new_provider="openrouter",
|
|
api_key="or-key",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
)
|
|
|
|
assert agent._fallback_chain == chain
|