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.
75 lines
2.2 KiB
Python
75 lines
2.2 KiB
Python
"""Verify Shift+Enter byte sequences parse to the same key tuple Alt+Enter
|
|
produces, so the existing Alt+Enter newline handler in `cli.py` fires for
|
|
terminals that emit a distinct Shift+Enter under the Kitty keyboard protocol
|
|
or xterm modifyOtherKeys mode.
|
|
"""
|
|
|
|
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_shift_enter_alias
|
|
|
|
|
|
SHIFT_ENTER_SEQUENCES = (
|
|
"\x1b[13;2u", # Kitty / CSI-u, modifier=2 (Shift)
|
|
"\x1b[27;2;13~", # xterm modifyOtherKeys=2
|
|
"\x1b[27;2;13u",
|
|
)
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _ensure_alias_installed():
|
|
"""Make every test idempotent — install the alias once per test run."""
|
|
install_shift_enter_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]
|
|
|
|
|
|
def test_install_registers_all_three_sequences():
|
|
for seq in SHIFT_ENTER_SEQUENCES:
|
|
assert seq in ANSI_SEQUENCES, f"missing mapping for {seq!r}"
|
|
assert ANSI_SEQUENCES[seq] == (Keys.Escape, Keys.ControlM)
|
|
|
|
|
|
|
|
|
|
def test_install_returns_zero_when_already_correct():
|
|
"""Idempotency — running install twice should not report a second change."""
|
|
install_shift_enter_alias()
|
|
assert install_shift_enter_alias() == 0
|
|
|
|
|
|
def test_csi_u_shift_enter_parses_as_alt_enter():
|
|
"""Kitty keyboard protocol Shift+Enter must parse to the same key tuple
|
|
Alt+Enter produces, so the existing handler is reused."""
|
|
alt_enter = _parse("\x1b\r")
|
|
shift_enter = _parse("\x1b[13;2u")
|
|
assert shift_enter == alt_enter, (
|
|
f"Shift+Enter via CSI-u should parse identically to Alt+Enter; "
|
|
f"got {shift_enter!r} vs {alt_enter!r}"
|
|
)
|
|
|
|
|
|
|
|
|
|
def test_plain_enter_remains_distinct_from_alt_enter():
|
|
"""Plain Enter must keep emitting a single key (submit), not a two-key
|
|
Alt+Enter tuple — otherwise we would have broken submit."""
|
|
enter = _parse("\r")
|
|
alt_enter = _parse("\x1b\r")
|
|
assert enter != alt_enter
|
|
assert len(enter) == 1
|
|
assert len(alt_enter) == 2
|