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.
65 lines
2.6 KiB
Python
65 lines
2.6 KiB
Python
"""Enter arriving mid-paste (no bracketed paste; each newline is its own key event) must not
|
|
submit / steer the partial line (#10994). Only the Enter-vs-recent-text-change timing is exercised;
|
|
the real prompt_toolkit Buffer carries the text so the newline lands where the user's did."""
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock
|
|
|
|
from prompt_toolkit.buffer import Buffer
|
|
|
|
from hermes_cli.cli_tui_mixin import _RAPID_INPUT_ENTER_WINDOW_S
|
|
|
|
|
|
def _shell():
|
|
from cli import HermesCLI
|
|
shell = object.__new__(HermesCLI)
|
|
shell._tui_enter_overlay = lambda event: False
|
|
shell._tui_multiline_shortcuts = False
|
|
shell._attached_images = []
|
|
shell._agent_running = True
|
|
shell._tui_enter_while_busy = MagicMock()
|
|
shell._tui_enter_inline_command = lambda *a, **k: False
|
|
shell._inline_pastes = lambda buf: None
|
|
shell._tui_paste_counter = 0
|
|
shell.config = {}
|
|
shell._tui_prev_text_len = shell._tui_prev_newline_count = 0
|
|
shell._tui_paste_just_collapsed = shell._skip_paste_collapse = False
|
|
return shell
|
|
|
|
|
|
def _event(buf: Buffer):
|
|
return SimpleNamespace(app=SimpleNamespace(current_buffer=buf, invalidate=lambda: None, is_running=False))
|
|
|
|
|
|
def test_enter_right_after_text_arrives_is_a_newline_not_a_steer():
|
|
"""Line 1 of a paste followed by Enter within the window stays in the buffer; the same Enter
|
|
after a human-scale pause submits the accumulated multi-line message once."""
|
|
shell = _shell()
|
|
buf = Buffer()
|
|
buf.on_text_changed += shell._tui_on_text_changed
|
|
buf.insert_text("line one")
|
|
shell._tui_handle_enter(_event(buf)) # < 50 ms after the text change
|
|
assert buf.text == "line one\n"
|
|
shell._tui_enter_while_busy.assert_not_called()
|
|
|
|
buf.insert_text("line two")
|
|
time.sleep(_RAPID_INPUT_ENTER_WINDOW_S * 3) # the paste has finished; a human presses Enter
|
|
shell._tui_handle_enter(_event(buf))
|
|
shell._tui_enter_while_busy.assert_called_once()
|
|
assert shell._tui_enter_while_busy.call_args.args[0] == "line one\nline two"
|
|
|
|
|
|
def test_fast_backslash_continuation_still_consumes_the_backslash():
|
|
"""`\\` + Enter inside a paste (multiline shortcuts on) behaves like a typed one: the
|
|
backslash is removed and a newline inserted, never a literal backslash left in the text."""
|
|
shell = _shell()
|
|
shell._tui_multiline_shortcuts = True
|
|
buf = Buffer()
|
|
buf.on_text_changed += shell._tui_on_text_changed
|
|
buf.insert_text("alpha \\")
|
|
shell._tui_handle_enter(_event(buf)) # < 50 ms after the text change
|
|
assert buf.text == "alpha \n"
|
|
shell._tui_enter_while_busy.assert_not_called()
|