f6938b37f3
tools/terminal_tool.py: drop 30 pure re-export names (lifecycle/config/backends/
sudo/guards/result/interrupt/utils/_DockerEnvironment/is_managed_tool_gateway_ready)
and the noqa-F401 comments on the 25 names the facade itself uses. Sibling modules
(terminal_tool_backends/_result/_sudo/_lifecycle, environments/base, process_registry)
that read removed names through the facade now import from the defining module.
tools/environments/base.py: drop 11 re-exports (base_output/base_session_env/
path_utils) and the BaseEnvironment.stop() compat alias (no in-tree caller; the
lifecycle hasattr(env, 'stop') fallback stays for third-party envs).
tools/environments/docker.py: drop 1 re-export + the re-export comment.
Callers/tests repointed to tools.terminal_tool_{lifecycle,backends,sudo,config,
guards,result}, tools.interrupt, tools.environments.{base_output,base_session_env,
path_utils}.
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
|