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.
208 lines
7.7 KiB
Python
208 lines
7.7 KiB
Python
"""Regression test for #33175: switch_model() must roll back to the pre-swap
|
|
state if the client rebuild raises.
|
|
|
|
Before the fix, ``agent.model`` and ``agent.provider`` were assigned BEFORE
|
|
the client rebuild was attempted, with no try/except to restore them on
|
|
failure. An exception during ``build_anthropic_client`` / OpenAI client
|
|
construction left the agent with the new model+provider name but the OLD
|
|
client — producing HTTP 400s like "claude-sonnet-4-6 is not supported on
|
|
openai-codex" on the next turn.
|
|
|
|
These tests exercise both branches (openai_chat_completions and
|
|
anthropic_messages) and assert that every mutated field returns to its
|
|
pre-swap value when the rebuild raises.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _make_agent_openrouter():
|
|
"""Agent on openrouter (openai-compatible) with sentinel client + kwargs."""
|
|
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-original"
|
|
agent.api_mode = "chat_completions"
|
|
agent.client = MagicMock(name="OriginalOpenRouterClient")
|
|
agent._client_kwargs = {
|
|
"api_key": "or-key-original",
|
|
"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 = []
|
|
agent._fallback_model = None
|
|
agent._config_context_length = None
|
|
agent.runtime_capabilities = {"native_compaction": False}
|
|
|
|
return agent
|
|
|
|
|
|
def _make_agent_anthropic():
|
|
"""Agent on native anthropic with a sentinel anthropic client."""
|
|
agent = AIAgent.__new__(AIAgent)
|
|
|
|
agent.provider = "anthropic"
|
|
agent.model = "claude-sonnet-4-5"
|
|
agent.base_url = "https://api.anthropic.com"
|
|
agent.api_key = "sk-ant-original"
|
|
agent.api_mode = "anthropic_messages"
|
|
agent.client = None
|
|
agent._client_kwargs = {}
|
|
agent.context_compressor = None
|
|
agent._anthropic_api_key = "sk-ant-original"
|
|
agent._anthropic_base_url = "https://api.anthropic.com"
|
|
agent._anthropic_client = MagicMock(name="OriginalAnthropicClient")
|
|
agent._is_anthropic_oauth = False
|
|
agent._cached_system_prompt = "cached"
|
|
agent._primary_runtime = {}
|
|
agent._fallback_activated = False
|
|
agent._fallback_index = 0
|
|
agent._fallback_chain = []
|
|
agent._fallback_model = None
|
|
agent._config_context_length = None
|
|
agent.runtime_capabilities = {"native_compaction": False}
|
|
|
|
return agent
|
|
|
|
|
|
def test_openai_client_rebuild_failure_rolls_back_to_original_state():
|
|
"""When OpenAI client construction fails, every mutated field must restore."""
|
|
agent = _make_agent_openrouter()
|
|
|
|
original_client = agent.client
|
|
original_kwargs = dict(agent._client_kwargs)
|
|
|
|
# _create_openai_client raises mid-swap (simulates bad key / network error)
|
|
def boom(*_a, **_kw):
|
|
raise RuntimeError("simulated client build failure")
|
|
|
|
agent._create_openai_client = boom
|
|
|
|
with patch("hermes_cli.timeouts.get_provider_request_timeout", return_value=None):
|
|
with pytest.raises(RuntimeError, match="simulated client build failure"):
|
|
agent.switch_model(
|
|
new_model="openai/gpt-5",
|
|
new_provider="openai-codex",
|
|
api_key="codex-key-new",
|
|
base_url="https://chatgpt.com/backend-api/codex/responses",
|
|
api_mode="chat_completions",
|
|
)
|
|
|
|
# Core invariant: agent state is unchanged from before the call
|
|
assert agent.model == "x-ai/grok-4"
|
|
assert agent.provider == "openrouter"
|
|
assert agent.base_url == "https://openrouter.ai/api/v1"
|
|
assert agent.api_mode == "chat_completions"
|
|
assert agent.api_key == "or-key-original"
|
|
assert agent.client is original_client
|
|
assert agent._client_kwargs == original_kwargs
|
|
assert agent.runtime_capabilities == {"native_compaction": False}
|
|
|
|
|
|
def test_anthropic_client_rebuild_failure_rolls_back_to_original_state():
|
|
"""When build_anthropic_client raises, every mutated field must restore."""
|
|
agent = _make_agent_anthropic()
|
|
|
|
original_anthropic_client = agent._anthropic_client
|
|
original_anthropic_key = agent._anthropic_api_key
|
|
original_anthropic_base = agent._anthropic_base_url
|
|
|
|
with (
|
|
patch(
|
|
"agent.anthropic_adapter.build_anthropic_client",
|
|
side_effect=RuntimeError("simulated anthropic build failure"),
|
|
),
|
|
patch(
|
|
"agent.anthropic_credentials.resolve_anthropic_token",
|
|
return_value="sk-ant-resolved",
|
|
),
|
|
patch("agent.anthropic_credentials._is_oauth_token", return_value=False),
|
|
patch("hermes_cli.timeouts.get_provider_request_timeout", return_value=None),
|
|
):
|
|
with pytest.raises(RuntimeError, match="simulated anthropic build failure"):
|
|
agent.switch_model(
|
|
new_model="claude-opus-4-6",
|
|
new_provider="opencode-zen",
|
|
api_key="zen-key-new",
|
|
base_url="https://opencode.example/v1",
|
|
api_mode="anthropic_messages",
|
|
)
|
|
|
|
# Anthropic-specific state restored
|
|
assert agent._anthropic_client is original_anthropic_client
|
|
assert agent._anthropic_api_key == original_anthropic_key
|
|
assert agent._anthropic_base_url == original_anthropic_base
|
|
|
|
# Core state also restored
|
|
assert agent.model == "claude-sonnet-4-5"
|
|
assert agent.provider == "anthropic"
|
|
assert agent.base_url == "https://api.anthropic.com"
|
|
assert agent.api_mode == "anthropic_messages"
|
|
assert agent.api_key == "sk-ant-original"
|
|
|
|
|
|
def test_cross_branch_anthropic_to_openai_rebuild_failure_rolls_back():
|
|
"""Switching from anthropic_messages to chat_completions: failure must
|
|
restore the anthropic state, not leave the agent half-converted."""
|
|
agent = _make_agent_anthropic()
|
|
|
|
original_anthropic_client = agent._anthropic_client
|
|
|
|
def boom(*_a, **_kw):
|
|
raise RuntimeError("openai client failed")
|
|
|
|
agent._create_openai_client = boom
|
|
|
|
with patch("hermes_cli.timeouts.get_provider_request_timeout", return_value=None):
|
|
with pytest.raises(RuntimeError, match="openai client failed"):
|
|
agent.switch_model(
|
|
new_model="x-ai/grok-4",
|
|
new_provider="openrouter",
|
|
api_key="or-key-new",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
api_mode="chat_completions",
|
|
)
|
|
|
|
# Anthropic client preserved (not nulled by the openai branch)
|
|
assert agent._anthropic_client is original_anthropic_client
|
|
assert agent.model == "claude-sonnet-4-5"
|
|
assert agent.provider == "anthropic"
|
|
assert agent.api_mode == "anthropic_messages"
|
|
assert agent.base_url == "https://api.anthropic.com"
|
|
|
|
|
|
def test_successful_switch_still_works_after_rollback_refactor():
|
|
"""Sanity check: the try/except wrapper hasn't broken the happy path."""
|
|
agent = _make_agent_openrouter()
|
|
|
|
new_client = MagicMock(name="NewClient")
|
|
agent._create_openai_client = lambda *_a, **_kw: new_client
|
|
|
|
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-new",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
api_mode="chat_completions",
|
|
)
|
|
|
|
assert agent.model == "openai/gpt-5"
|
|
assert agent.provider == "openrouter"
|
|
assert agent.api_key == "or-key-new"
|
|
assert agent.client is new_client
|