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.
102 lines
3.5 KiB
Python
102 lines
3.5 KiB
Python
"""Tests for Nous fallback local-availability suppression.
|
|
|
|
Blocker if Nous token material is missing locally: the fallback chain
|
|
should not repeatedly attempt Nous resolution; it must skip and continue
|
|
to the next provider.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import patch
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _make_agent(fallback_model=None):
|
|
with (
|
|
patch("model_tools.get_tool_definitions", return_value=[]),
|
|
patch("model_tools.check_toolset_requirements", return_value={}),
|
|
patch("agent.process_bootstrap.OpenAI"),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="test-key",
|
|
provider="openai-codex",
|
|
base_url="https://chatgpt.com/backend-api/codex",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
fallback_model=fallback_model,
|
|
)
|
|
agent.client = None
|
|
return agent
|
|
|
|
|
|
def _mock_client(base_url="https://chatgpt.com/backend-api/codex", api_key="fb-key"):
|
|
mock = type("Client", (), {})()
|
|
mock.base_url = base_url
|
|
mock.api_key = api_key
|
|
mock.chat = type("Chat", (), {})()
|
|
mock.chat.completions = type("Completions", (), {})()
|
|
mock.chat.completions.create = lambda *args, **kwargs: None
|
|
return mock
|
|
|
|
|
|
class TestNousFallbackLocalAvailability:
|
|
def test_missing_nous_token_is_skipped_once(self):
|
|
"""Nous fallback is skipped when no access/refresh token is stored."""
|
|
agent = _make_agent(
|
|
fallback_model=[
|
|
{"provider": "nous", "model": "anthropic/claude-sonnet-4.6"},
|
|
{"provider": "openai-codex", "model": "gpt-5.5"},
|
|
]
|
|
)
|
|
with patch(
|
|
"hermes_cli.auth.get_provider_auth_state",
|
|
return_value={},
|
|
), patch(
|
|
"agent.auxiliary_client.resolve_provider_client",
|
|
return_value=(_mock_client(api_key="fb"), "gpt-5.5"),
|
|
):
|
|
activated = agent._try_activate_fallback(None)
|
|
assert activated is True
|
|
assert agent.model == "gpt-5.5"
|
|
|
|
def test_nous_unavailable_not_retried_in_same_session(self):
|
|
"""After Nous is skipped once, subsequent activations continue further."""
|
|
agent = _make_agent(
|
|
fallback_model=[
|
|
{"provider": "nous", "model": "anthropic/claude-sonnet-4.6"},
|
|
{"provider": "openai-codex", "model": "gpt-5.5"},
|
|
]
|
|
)
|
|
with patch(
|
|
"hermes_cli.auth.get_provider_auth_state",
|
|
return_value={},
|
|
):
|
|
agent._try_activate_fallback(None)
|
|
key = (
|
|
"nous",
|
|
"anthropic/claude-sonnet-4.6",
|
|
"",
|
|
)
|
|
assert key in getattr(agent, "_unavailable_fallback_keys", set())
|
|
|
|
def test_present_nous_token_allows_activation(self):
|
|
"""Nous is considered when token material exists."""
|
|
agent = _make_agent(
|
|
fallback_model=[
|
|
{"provider": "nous", "model": "anthropic/claude-sonnet-4.6"},
|
|
{"provider": "openai-codex", "model": "gpt-5.5"},
|
|
]
|
|
)
|
|
with patch(
|
|
"hermes_cli.auth.get_provider_auth_state",
|
|
return_value={"access_token": "abc", "refresh_token": "xyz"},
|
|
), patch(
|
|
"agent.auxiliary_client.resolve_provider_client",
|
|
return_value=(_mock_client(api_key="fb"), "anthropic/claude-sonnet-4.6"),
|
|
):
|
|
activated = agent._try_activate_fallback(None)
|
|
assert activated is True
|
|
assert agent.provider == "nous"
|