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.
133 lines
5.1 KiB
Python
133 lines
5.1 KiB
Python
"""Tests for empty model fallback — when provider is configured but model is missing."""
|
|
|
|
from unittest.mock import patch
|
|
|
|
|
|
class TestGetDefaultModelForProvider:
|
|
"""Unit tests for hermes_cli.models.get_default_model_for_provider."""
|
|
|
|
def test_known_provider_returns_first_model(self):
|
|
from hermes_cli.models import get_default_model_for_provider
|
|
result = get_default_model_for_provider("openai-codex")
|
|
# Should return first model from _PROVIDER_MODELS["openai-codex"]
|
|
assert result
|
|
assert isinstance(result, str)
|
|
|
|
|
|
|
|
|
|
|
|
def test_catalog_label_overrides_constant(self):
|
|
"""A ``"default": true`` label in the cached catalog manifest wins over
|
|
the in-repo constant, so maintainers can rotate the silent default
|
|
without shipping a release."""
|
|
from unittest.mock import patch
|
|
|
|
from hermes_cli import models as models_mod
|
|
|
|
with patch(
|
|
"hermes_cli.model_catalog.get_default_model_from_cache",
|
|
return_value="qwen/qwen3.8-max-0902",
|
|
):
|
|
assert (
|
|
models_mod.get_preferred_silent_default_model("nous")
|
|
== "qwen/qwen3.8-max-0902"
|
|
)
|
|
# nous catalog carries qwen3.8-max-0902, so the full resolver follows.
|
|
assert (
|
|
models_mod.get_default_model_for_provider("nous")
|
|
== "qwen/qwen3.8-max-0902"
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestGatewayEmptyModelFallback:
|
|
"""Test that _resolve_session_agent_runtime fills in empty model from provider catalog."""
|
|
|
|
def test_empty_model_filled_from_provider(self):
|
|
"""When config has no model but provider is openai-codex, use first codex model."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._session_model_overrides = {}
|
|
|
|
# Mock _resolve_gateway_model to return empty string
|
|
# Mock _resolve_runtime_agent_kwargs to return openai-codex provider
|
|
with patch("gateway.run._resolve_gateway_model", return_value=""), \
|
|
patch("gateway.run._resolve_runtime_agent_kwargs", return_value={
|
|
"provider": "openai-codex",
|
|
"api_key": "test-key",
|
|
"base_url": "https://chatgpt.com/backend-api/codex",
|
|
"api_mode": "codex_responses",
|
|
}):
|
|
model, kwargs = runner._resolve_session_agent_runtime()
|
|
|
|
# Model should have been filled in from provider catalog
|
|
assert model, "Model should not be empty when provider is known"
|
|
assert isinstance(model, str)
|
|
assert kwargs["provider"] == "openai-codex"
|
|
|
|
def test_nonempty_model_not_overridden(self):
|
|
"""When config has a model set, don't override it."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._session_model_overrides = {}
|
|
|
|
with patch("gateway.run._resolve_gateway_model", return_value="gpt-5.4"), \
|
|
patch("gateway.run._resolve_runtime_agent_kwargs", return_value={
|
|
"provider": "openai-codex",
|
|
"api_key": "test-key",
|
|
"base_url": "https://chatgpt.com/backend-api/codex",
|
|
"api_mode": "codex_responses",
|
|
}):
|
|
model, kwargs = runner._resolve_session_agent_runtime()
|
|
|
|
assert model == "gpt-5.4", "Explicit model should not be overridden"
|
|
|
|
def test_empty_model_no_provider_stays_empty(self):
|
|
"""When both model and provider are empty, model stays empty."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._session_model_overrides = {}
|
|
|
|
with patch("gateway.run._resolve_gateway_model", return_value=""), \
|
|
patch("gateway.run._resolve_runtime_agent_kwargs", return_value={
|
|
"provider": "",
|
|
"api_key": "test-key",
|
|
"base_url": "https://example.com",
|
|
"api_mode": "chat_completions",
|
|
}):
|
|
model, kwargs = runner._resolve_session_agent_runtime()
|
|
|
|
# Can't fill in a default without knowing the provider
|
|
assert model == ""
|
|
|
|
|
|
class TestResolveGatewayModel:
|
|
"""Test _resolve_gateway_model reads model from config correctly."""
|
|
|
|
def test_returns_default_key(self):
|
|
from gateway.run import _resolve_gateway_model
|
|
assert _resolve_gateway_model({"model": {"default": "gpt-5.4"}}) == "gpt-5.4"
|
|
|
|
def test_returns_model_key_fallback(self):
|
|
from gateway.run import _resolve_gateway_model
|
|
assert _resolve_gateway_model({"model": {"model": "gpt-5.4"}}) == "gpt-5.4"
|
|
|
|
def test_returns_empty_when_missing(self):
|
|
from gateway.run import _resolve_gateway_model
|
|
assert _resolve_gateway_model({"model": {}}) == ""
|
|
|
|
def test_returns_empty_when_no_model_section(self):
|
|
from gateway.run import _resolve_gateway_model
|
|
assert _resolve_gateway_model({}) == ""
|
|
|
|
def test_string_model_config(self):
|
|
from gateway.run import _resolve_gateway_model
|
|
assert _resolve_gateway_model({"model": "my-model"}) == "my-model"
|