teknium1
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.
91 lines
2.1 KiB
Python
91 lines
2.1 KiB
Python
"""Tests for acp_adapter.entry startup wiring."""
|
|
|
|
import sys
|
|
|
|
import acp
|
|
import pytest
|
|
|
|
from acp_adapter import entry
|
|
|
|
|
|
def test_main_enables_unstable_protocol(monkeypatch):
|
|
calls = {}
|
|
|
|
async def fake_run_agent(agent, **kwargs):
|
|
calls["kwargs"] = kwargs
|
|
|
|
monkeypatch.setattr(entry, "_setup_logging", lambda: None)
|
|
monkeypatch.setattr(entry, "_load_env", lambda: None)
|
|
monkeypatch.setattr(acp, "run_agent", fake_run_agent)
|
|
|
|
entry.main([])
|
|
|
|
assert calls["kwargs"]["use_unstable_protocol"] is True
|
|
|
|
|
|
def test_main_skips_configured_mcp_discovery_when_requested(monkeypatch):
|
|
discovery_calls = []
|
|
|
|
async def fake_run_agent(agent, **kwargs):
|
|
pass
|
|
|
|
monkeypatch.setattr(entry, "_setup_logging", lambda: None)
|
|
monkeypatch.setattr(entry, "_load_env", lambda: None)
|
|
monkeypatch.setenv("HERMES_ACP_SKIP_CONFIGURED_MCP", "1")
|
|
monkeypatch.setattr(
|
|
"tools.mcp_tool_discovery.discover_mcp_tools",
|
|
lambda: discovery_calls.append(True),
|
|
)
|
|
monkeypatch.setattr(acp, "run_agent", fake_run_agent)
|
|
|
|
entry.main([])
|
|
|
|
assert discovery_calls == []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_main_setup_offers_browser_install_when_tty(monkeypatch):
|
|
"""When stdin is a TTY and the user answers yes, model setup is followed
|
|
by a browser-tools bootstrap call."""
|
|
monkeypatch.setattr("hermes_cli.main.main", lambda: None)
|
|
monkeypatch.setattr("sys.stdin.isatty", lambda: True)
|
|
monkeypatch.setattr("builtins.input", lambda *_args, **_kwargs: "y")
|
|
|
|
bootstrap_calls = []
|
|
monkeypatch.setattr(
|
|
entry,
|
|
"_run_setup_browser",
|
|
lambda assume_yes=False: bootstrap_calls.append(assume_yes) or 0,
|
|
)
|
|
|
|
entry.main(["--setup"])
|
|
|
|
assert bootstrap_calls == [False]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_main_setup_browser_propagates_browser_failure(monkeypatch):
|
|
"""If browser install fails, exit code is 1."""
|
|
def fake_ensure(dep, interactive=True):
|
|
return dep != "browser" # browser fails
|
|
|
|
monkeypatch.setattr("hermes_cli.dep_ensure.ensure_dependency", fake_ensure)
|
|
|
|
with pytest.raises(SystemExit) as excinfo:
|
|
entry.main(["--setup-browser"])
|
|
assert excinfo.value.code == 1
|