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.
58 lines
2.3 KiB
Python
58 lines
2.3 KiB
Python
"""Regression coverage for issue #16767."""
|
|
|
|
import sys
|
|
|
|
import hermes_cli.model_switch as ms
|
|
from hermes_cli.model_switch import DirectAlias
|
|
from hermes_cli.runtime_provider import _resolve_named_custom_runtime
|
|
|
|
def test_ensure_direct_aliases_mutates_in_place(monkeypatch):
|
|
"""_ensure_direct_aliases mutates DIRECT_ALIASES in place (guards against rebinding regression)."""
|
|
# Ensure we start with an empty but existing dict to check for mutation vs rebinding
|
|
ms.DIRECT_ALIASES.clear()
|
|
initial_id = id(ms.DIRECT_ALIASES)
|
|
|
|
mock_data = {
|
|
"my-custom-alias": DirectAlias("custom-model:v1", "custom", "https://example.com/v1")
|
|
}
|
|
monkeypatch.setattr(ms, "_load_direct_aliases", lambda: mock_data)
|
|
|
|
ms._ensure_direct_aliases()
|
|
|
|
assert id(ms.DIRECT_ALIASES) == initial_id, f"DIRECT_ALIASES was rebound (ID changed from {initial_id} to {id(ms.DIRECT_ALIASES)})"
|
|
assert "my-custom-alias" in ms.DIRECT_ALIASES
|
|
assert ms.DIRECT_ALIASES["my-custom-alias"].model == "custom-model:v1"
|
|
|
|
def test_chat_provider_argparse_acceptance(monkeypatch):
|
|
"""chat --provider <user-defined> is accepted by argparse (guards against restrictive choices)."""
|
|
recorded: dict[str, str] = {}
|
|
|
|
# Mock cmd_chat to record the provider passed to it
|
|
def mock_cmd_chat(args):
|
|
recorded["provider"] = args.provider
|
|
|
|
monkeypatch.setattr("hermes_cli.main.cmd_chat", mock_cmd_chat)
|
|
monkeypatch.setattr(sys, "argv", ["hermes", "chat", "--provider", "my-custom-key"])
|
|
|
|
from hermes_cli.main import main
|
|
main()
|
|
|
|
assert recorded["provider"] == "my-custom-key"
|
|
|
|
def test_resolve_named_custom_runtime_honors_explicit_base_url(monkeypatch):
|
|
"""_resolve_named_custom_runtime honors (provider='custom', explicit_base_url=...)."""
|
|
# Mock has_usable_secret to recognize our test key
|
|
monkeypatch.setattr("hermes_cli.runtime_provider.has_usable_secret", lambda x: x == "test-api-key")
|
|
|
|
result = _resolve_named_custom_runtime(
|
|
requested_provider="custom",
|
|
explicit_api_key="test-api-key",
|
|
explicit_base_url="http://example.test:1234/v1"
|
|
)
|
|
|
|
assert result is not None
|
|
assert result["base_url"] == "http://example.test:1234/v1"
|
|
assert result["provider"] == "custom"
|
|
assert result["api_key"] == "test-api-key"
|
|
assert result["source"] == "direct-alias"
|