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.
110 lines
3.4 KiB
Python
110 lines
3.4 KiB
Python
"""Tests for CLI external-editor support."""
|
|
|
|
from unittest.mock import patch
|
|
|
|
from cli import HermesCLI
|
|
|
|
|
|
class _FakeBuffer:
|
|
def __init__(self, text=""):
|
|
self.calls = []
|
|
self.text = text
|
|
self.cursor_position = len(text)
|
|
|
|
def open_in_editor(self, validate_and_handle=False):
|
|
self.calls.append(validate_and_handle)
|
|
|
|
|
|
class _FakeApp:
|
|
def __init__(self):
|
|
self.current_buffer = _FakeBuffer()
|
|
|
|
|
|
def _make_cli(with_app=True):
|
|
cli_obj = HermesCLI.__new__(HermesCLI)
|
|
cli_obj._app = _FakeApp() if with_app else None
|
|
cli_obj._command_running = False
|
|
cli_obj._command_status = ""
|
|
cli_obj._command_display = ""
|
|
cli_obj._sudo_state = None
|
|
cli_obj._secret_state = None
|
|
cli_obj._approval_state = None
|
|
cli_obj._clarify_state = None
|
|
cli_obj._skip_paste_collapse = False
|
|
return cli_obj
|
|
|
|
def test_open_external_editor_uses_prompt_toolkit_buffer_editor():
|
|
cli_obj = _make_cli()
|
|
|
|
assert cli_obj._open_external_editor() is True
|
|
assert cli_obj._app.current_buffer.calls == [False]
|
|
|
|
|
|
def test_open_external_editor_rejects_when_no_tui():
|
|
cli_obj = _make_cli(with_app=False)
|
|
|
|
with patch("cli._cprint") as mock_cprint:
|
|
assert cli_obj._open_external_editor() is False
|
|
|
|
assert mock_cprint.called
|
|
assert "interactive cli" in str(mock_cprint.call_args).lower()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_open_external_editor_expands_paste_placeholders_before_open(tmp_path):
|
|
cli_obj = _make_cli()
|
|
paste_file = tmp_path / "paste.txt"
|
|
paste_file.write_text("alpha\nbeta", encoding="utf-8")
|
|
buffer = _FakeBuffer(text=f"[Pasted text #1: 2 lines → {paste_file}]")
|
|
|
|
assert cli_obj._open_external_editor(buffer=buffer) is True
|
|
assert buffer.text == "alpha\nbeta"
|
|
assert buffer.cursor_position == len("alpha\nbeta")
|
|
assert buffer.calls == [False]
|
|
|
|
|
|
def test_open_external_editor_sets_skip_collapse_flag_during_expansion(tmp_path):
|
|
cli_obj = _make_cli()
|
|
paste_file = tmp_path / "paste.txt"
|
|
paste_file.write_text("a\nb\nc\nd\ne\nf", encoding="utf-8")
|
|
buffer = _FakeBuffer(text=f"[Pasted text #1: 6 lines \u2192 {paste_file}]")
|
|
|
|
# After expansion the flag should have been set (to prevent re-collapse)
|
|
assert cli_obj._open_external_editor(buffer=buffer) is True
|
|
# Flag is consumed by _on_text_changed, but since no handler is attached
|
|
# in tests it stays True until the handler resets it.
|
|
assert cli_obj._skip_paste_collapse is True
|
|
|
|
|
|
def test_inline_pastes_stores_full_content(tmp_path):
|
|
"""History should recall the actual pasted text, not the placeholder."""
|
|
cli_obj = _make_cli()
|
|
paste_file = tmp_path / "paste.txt"
|
|
paste_file.write_text("line one\nline two", encoding="utf-8")
|
|
buffer = _FakeBuffer(text=f"[Pasted text #1: 2 lines \u2192 {paste_file}]")
|
|
|
|
cli_obj._inline_pastes(buffer)
|
|
|
|
assert buffer.text == "line one\nline two"
|
|
assert buffer.cursor_position == len("line one\nline two")
|
|
# Skip flag set so the resulting text-change doesn't re-collapse.
|
|
assert cli_obj._skip_paste_collapse is True
|
|
|
|
|
|
|
|
|
|
def test_inline_pastes_missing_file_keeps_placeholder(tmp_path):
|
|
"""A recalled reference whose file is gone stays as the placeholder."""
|
|
cli_obj = _make_cli()
|
|
placeholder = f"[Pasted text #1: 2 lines \u2192 {tmp_path / 'gone.txt'}]"
|
|
buffer = _FakeBuffer(text=placeholder)
|
|
|
|
cli_obj._inline_pastes(buffer)
|
|
|
|
assert buffer.text == placeholder
|
|
assert cli_obj._skip_paste_collapse is False
|