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
3.1 KiB
Python
91 lines
3.1 KiB
Python
import importlib
|
|
import sys
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
|
|
|
|
_cli_mod = None
|
|
|
|
|
|
def _make_cli(user_message_preview=None):
|
|
global _cli_mod
|
|
clean_config = {
|
|
"model": {
|
|
"default": "anthropic/claude-opus-4.6",
|
|
"base_url": "https://openrouter.ai/api/v1",
|
|
"provider": "auto",
|
|
},
|
|
"display": {
|
|
"compact": False,
|
|
"tool_progress": "all",
|
|
"user_message_preview": user_message_preview or {"first_lines": 2, "last_lines": 2},
|
|
},
|
|
"agent": {},
|
|
"terminal": {"env_type": "local"},
|
|
}
|
|
clean_env = {"LLM_MODEL": "", "HERMES_MAX_ITERATIONS": ""}
|
|
prompt_toolkit_stubs = {
|
|
"prompt_toolkit": MagicMock(),
|
|
"prompt_toolkit.history": MagicMock(),
|
|
"prompt_toolkit.styles": MagicMock(),
|
|
"prompt_toolkit.patch_stdout": MagicMock(),
|
|
"prompt_toolkit.application": MagicMock(),
|
|
"prompt_toolkit.layout": MagicMock(),
|
|
"prompt_toolkit.layout.processors": MagicMock(),
|
|
"prompt_toolkit.filters": MagicMock(),
|
|
"prompt_toolkit.layout.dimension": MagicMock(),
|
|
"prompt_toolkit.layout.menus": MagicMock(),
|
|
"prompt_toolkit.widgets": MagicMock(),
|
|
"prompt_toolkit.key_binding": MagicMock(),
|
|
"prompt_toolkit.completion": MagicMock(),
|
|
"prompt_toolkit.formatted_text": MagicMock(),
|
|
"prompt_toolkit.auto_suggest": MagicMock(),
|
|
}
|
|
with patch.dict(sys.modules, prompt_toolkit_stubs), patch.dict("os.environ", clean_env, clear=False):
|
|
import cli as mod
|
|
|
|
mod = importlib.reload(mod)
|
|
_cli_mod = mod
|
|
with patch.object(mod, "get_tool_definitions", return_value=[]), patch.dict(mod.__dict__, {"CLI_CONFIG": clean_config}):
|
|
return mod.HermesCLI()
|
|
|
|
|
|
class TestSubmittedUserMessagePreview:
|
|
def test_default_preview_shows_first_two_lines_and_last_two_lines(self):
|
|
cli = _make_cli()
|
|
|
|
rendered = cli._format_submitted_user_message_preview(
|
|
"line1\nline2\nline3\nline4\nline5\nline6"
|
|
)
|
|
|
|
assert "line1" in rendered
|
|
assert "line2" in rendered
|
|
assert "line5" in rendered
|
|
assert "line6" in rendered
|
|
assert "line3" not in rendered
|
|
assert "line4" not in rendered
|
|
assert "(+2 more lines)" in rendered
|
|
|
|
def test_preview_can_hide_last_lines(self):
|
|
cli = _make_cli({"first_lines": 2, "last_lines": 0})
|
|
|
|
rendered = cli._format_submitted_user_message_preview(
|
|
"line1\nline2\nline3\nline4\nline5\nline6"
|
|
)
|
|
|
|
assert "line1" in rendered
|
|
assert "line2" in rendered
|
|
assert "line5" not in rendered
|
|
assert "line6" not in rendered
|
|
assert "(+4 more lines)" in rendered
|
|
|
|
def test_invalid_first_lines_value_falls_back_to_one(self):
|
|
cli = _make_cli({"first_lines": 0, "last_lines": 2})
|
|
|
|
rendered = cli._format_submitted_user_message_preview("line1\nline2\nline3\nline4")
|
|
|
|
assert "line1" in rendered
|
|
assert "line3" in rendered
|
|
assert "line4" in rendered
|
|
assert "(+1 more line)" in rendered
|