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.
80 lines
2.4 KiB
Python
80 lines
2.4 KiB
Python
"""Verify Cmd+Backspace / Cmd+ForwardDelete byte sequences from CSI-u
|
|
terminals reach prompt_toolkit's readline kill bindings instead of leaking
|
|
into the buffer as literal text.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from prompt_toolkit.input.ansi_escape_sequences import ANSI_SEQUENCES
|
|
from prompt_toolkit.input.vt100_parser import Vt100Parser
|
|
from prompt_toolkit.keys import Keys
|
|
|
|
from hermes_cli.pt_input_extras import install_cmd_backspace_alias
|
|
|
|
|
|
# Cmd rides as the super modifier bit (8), so modifier = 9 (super) or
|
|
# 10 (super+shift).
|
|
CMD_BACKSPACE_SEQUENCES = (
|
|
"\x1b[127;9u", # Kitty CSI-u
|
|
"\x1b[127;10u", # Kitty CSI-u, +shift
|
|
"\x1b[27;9;127~", # xterm modifyOtherKeys
|
|
)
|
|
|
|
# Forward-delete is a CSI tilde key, not a CSI-u codepoint.
|
|
CMD_FWD_DELETE_SEQUENCES = (
|
|
"\x1b[3;9~",
|
|
"\x1b[3;10~",
|
|
)
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _ensure_alias_installed():
|
|
install_cmd_backspace_alias()
|
|
|
|
|
|
def _parse(byte_seq: str):
|
|
out = []
|
|
parser = Vt100Parser(out.append)
|
|
for ch in byte_seq:
|
|
parser.feed(ch)
|
|
parser.flush()
|
|
return [kp.key for kp in out]
|
|
|
|
|
|
@pytest.mark.parametrize("seq", CMD_BACKSPACE_SEQUENCES)
|
|
def test_cmd_backspace_parses_as_ctrl_u(seq):
|
|
"""Cmd+Backspace must reach unix-line-discard, exactly as Ctrl+U does."""
|
|
assert _parse(seq) == _parse("\x15")
|
|
|
|
|
|
@pytest.mark.parametrize("seq", CMD_FWD_DELETE_SEQUENCES)
|
|
def test_cmd_forward_delete_parses_as_ctrl_k(seq):
|
|
"""Cmd+ForwardDelete must reach kill-line, exactly as Ctrl+K does."""
|
|
assert _parse(seq) == _parse("\x0b")
|
|
|
|
|
|
@pytest.mark.parametrize("seq", CMD_BACKSPACE_SEQUENCES + CMD_FWD_DELETE_SEQUENCES)
|
|
def test_sequences_emit_exactly_one_keypress(seq):
|
|
"""The whole sequence is consumed. A partial match would emit Escape
|
|
plus the remainder as literal text — the bug this alias exists to fix."""
|
|
assert len(_parse(seq)) == 1
|
|
|
|
|
|
def test_install_is_idempotent():
|
|
install_cmd_backspace_alias()
|
|
assert install_cmd_backspace_alias() == 0
|
|
|
|
|
|
def test_unmodified_keys_keep_their_own_bindings():
|
|
"""Aliasing the Cmd variants must not disturb the bare keys."""
|
|
assert ANSI_SEQUENCES["\x1b[3~"] == Keys.Delete
|
|
assert ANSI_SEQUENCES["\x7f"] == Keys.ControlH
|
|
|
|
|
|
def test_ctrl_forward_delete_is_not_remapped():
|
|
"""Ctrl+ForwardDelete (modifier 5) is delete-word on Linux/Windows and
|
|
must keep prompt_toolkit's own binding, not become kill-line."""
|
|
assert ANSI_SEQUENCES["\x1b[3;5~"] == Keys.ControlDelete
|