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.
49 lines
1.7 KiB
Python
49 lines
1.7 KiB
Python
"""Regression coverage for provider-aware @-context sizing in the CLI."""
|
|
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
|
|
def test_at_context_resolution_passes_active_provider():
|
|
"""The CLI @-reference path must preserve the active Codex provider."""
|
|
from cli import HermesCLI
|
|
|
|
cli = HermesCLI.__new__(HermesCLI)
|
|
cli.model = "gpt-5.6-terra"
|
|
cli.base_url = "https://chatgpt.com/backend-api/codex"
|
|
cli.api_key = "token"
|
|
cli.provider = "openai-codex"
|
|
cli.agent = SimpleNamespace(_config_context_length=None)
|
|
cli._active_agent_route_signature = "route"
|
|
cli._secret_capture_callback = lambda *_args, **_kwargs: None
|
|
cli._last_turn_interrupted = False
|
|
cli._ensure_runtime_credentials = lambda: True
|
|
cli._resolve_turn_agent_config = lambda _message: {
|
|
"signature": "route",
|
|
"model": cli.model,
|
|
"runtime": None,
|
|
"request_overrides": None,
|
|
}
|
|
cli._init_agent = lambda **_kwargs: True
|
|
|
|
blocked_result = SimpleNamespace(
|
|
expanded=False,
|
|
blocked=True,
|
|
references=[],
|
|
injected_tokens=0,
|
|
warnings=["blocked for test"],
|
|
)
|
|
with patch("agent.context_references.preprocess_context_references", return_value=blocked_result), \
|
|
patch("agent.model_metadata.get_model_context_length", return_value=372_000) as mock_context, \
|
|
patch("cli._cprint"):
|
|
result = cli.chat("inspect @file:example.py")
|
|
|
|
assert result == "blocked for test"
|
|
mock_context.assert_called_once_with(
|
|
"gpt-5.6-terra",
|
|
base_url="https://chatgpt.com/backend-api/codex",
|
|
api_key="token",
|
|
provider="openai-codex",
|
|
config_context_length=None,
|
|
)
|