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.
194 lines
6.2 KiB
Python
194 lines
6.2 KiB
Python
"""Tests for cli._cprint's bg-thread cooperation with prompt_toolkit.
|
|
|
|
Background: when a prompt_toolkit Application is running, a bg thread that
|
|
calls ``_pt_print`` directly can race with the input-area redraw and the
|
|
printed line can end up visually buried behind the prompt. ``_cprint`` now
|
|
routes cross-thread prints through ``run_in_terminal`` via
|
|
``loop.call_soon_threadsafe`` so the self-improvement background review's
|
|
``💾 Self-improvement review: …`` summary actually surfaces to the user.
|
|
|
|
These tests verify the routing logic without spinning up a real PT app.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
import types
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
|
|
import cli
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def reset_output_history():
|
|
cli._configure_output_history(False, 200)
|
|
yield
|
|
cli._configure_output_history(True, 200)
|
|
|
|
|
|
def test_cprint_no_app_direct_print(monkeypatch):
|
|
"""No active app → direct _pt_print, no run_in_terminal involvement."""
|
|
calls = []
|
|
monkeypatch.setattr(cli, "_pt_print", lambda x: calls.append(("pt_print", x)))
|
|
monkeypatch.setattr(cli, "_PT_ANSI", lambda t: ("ANSI", t))
|
|
|
|
# Patch the prompt_toolkit import the function performs internally.
|
|
fake_pt_app = types.ModuleType("prompt_toolkit.application")
|
|
fake_pt_app.get_app_or_none = lambda: None
|
|
fake_pt_app.run_in_terminal = lambda *a, **kw: calls.append(("run_in_terminal",))
|
|
monkeypatch.setitem(sys.modules, "prompt_toolkit.application", fake_pt_app)
|
|
|
|
cli._cprint("hello")
|
|
|
|
assert calls == [("pt_print", ("ANSI", "hello"))]
|
|
|
|
|
|
def test_cprint_app_not_running_direct_print(monkeypatch):
|
|
"""App exists but not running (e.g. teardown) → direct print."""
|
|
calls = []
|
|
monkeypatch.setattr(cli, "_pt_print", lambda x: calls.append(("pt_print", x)))
|
|
monkeypatch.setattr(cli, "_PT_ANSI", lambda t: t)
|
|
|
|
fake_app = SimpleNamespace(_is_running=False, loop=None)
|
|
fake_pt_app = types.ModuleType("prompt_toolkit.application")
|
|
fake_pt_app.get_app_or_none = lambda: fake_app
|
|
fake_pt_app.run_in_terminal = lambda *a, **kw: calls.append(("run_in_terminal",))
|
|
monkeypatch.setitem(sys.modules, "prompt_toolkit.application", fake_pt_app)
|
|
|
|
cli._cprint("x")
|
|
|
|
assert calls == [("pt_print", "x")]
|
|
|
|
|
|
|
|
|
|
def test_cprint_same_thread_as_app_loop_direct_print(monkeypatch):
|
|
"""App running on same thread → direct print (no scheduling)."""
|
|
direct_prints = []
|
|
monkeypatch.setattr(cli, "_pt_print", lambda x: direct_prints.append(x))
|
|
monkeypatch.setattr(cli, "_PT_ANSI", lambda t: t)
|
|
|
|
class FakeLoop:
|
|
def is_running(self):
|
|
return True
|
|
|
|
def call_soon_threadsafe(self, cb, *args):
|
|
raise AssertionError(
|
|
"call_soon_threadsafe must not be used on the app's own thread"
|
|
)
|
|
|
|
fake_loop = FakeLoop()
|
|
fake_asyncio = types.ModuleType("asyncio")
|
|
|
|
class _Policy:
|
|
def get_event_loop(self):
|
|
return fake_loop # same as app loop
|
|
|
|
fake_asyncio.get_event_loop_policy = lambda: _Policy()
|
|
monkeypatch.setitem(sys.modules, "asyncio", fake_asyncio)
|
|
|
|
fake_app = SimpleNamespace(_is_running=True, loop=fake_loop)
|
|
fake_pt_app = types.ModuleType("prompt_toolkit.application")
|
|
fake_pt_app.get_app_or_none = lambda: fake_app
|
|
fake_pt_app.run_in_terminal = lambda *a, **kw: None
|
|
monkeypatch.setitem(sys.modules, "prompt_toolkit.application", fake_pt_app)
|
|
|
|
cli._cprint("x")
|
|
|
|
assert direct_prints == ["x"]
|
|
|
|
|
|
|
|
|
|
def test_cprint_swallows_prompt_toolkit_import_error(monkeypatch):
|
|
"""If prompt_toolkit.application itself fails to import, fall back."""
|
|
direct_prints = []
|
|
monkeypatch.setattr(cli, "_pt_print", lambda x: direct_prints.append(x))
|
|
monkeypatch.setattr(cli, "_PT_ANSI", lambda t: t)
|
|
|
|
# Drop cached prompt_toolkit.application AND install a meta-path finder
|
|
# that raises ImportError on re-import.
|
|
monkeypatch.delitem(sys.modules, "prompt_toolkit.application", raising=False)
|
|
|
|
class _BlockFinder:
|
|
def find_module(self, name, path=None):
|
|
if name == "prompt_toolkit.application":
|
|
return self
|
|
return None
|
|
|
|
def load_module(self, name):
|
|
raise ImportError("blocked for test")
|
|
|
|
def find_spec(self, name, path=None, target=None):
|
|
if name == "prompt_toolkit.application":
|
|
# Returning a bogus spec that will fail on load works too,
|
|
# but raising here keeps the test simple.
|
|
raise ImportError("blocked for test")
|
|
return None
|
|
|
|
blocker = _BlockFinder()
|
|
sys.meta_path.insert(0, blocker)
|
|
try:
|
|
cli._cprint("fallback2")
|
|
finally:
|
|
sys.meta_path.remove(blocker)
|
|
|
|
assert direct_prints == ["fallback2"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_replay_output_history_rerenders_callable_entries(monkeypatch):
|
|
cli._configure_output_history(True, 10)
|
|
widths_seen = []
|
|
printed = []
|
|
|
|
def _render_current_width():
|
|
widths_seen.append("called")
|
|
return ["top border", "body"]
|
|
|
|
cli._record_output_history_entry(_render_current_width)
|
|
monkeypatch.setattr(cli, "_pt_print", lambda value: printed.append(value))
|
|
monkeypatch.setattr(cli, "_PT_ANSI", lambda text: text)
|
|
|
|
cli._replay_output_history()
|
|
|
|
assert widths_seen == ["called"]
|
|
assert printed == ["top border\nbody"]
|
|
assert list(cli._OUTPUT_HISTORY) == [_render_current_width]
|
|
|
|
|
|
|
|
|
|
def test_chat_console_records_rich_ansi_for_resize_replay(monkeypatch):
|
|
cli._configure_output_history(True, 10)
|
|
monkeypatch.setattr(cli, "_pt_print", lambda *_args, **_kwargs: None)
|
|
|
|
cli.ChatConsole().print("[bold red]Hello[/]")
|
|
|
|
assert cli._OUTPUT_HISTORY
|
|
assert any("\x1b[" in line for line in cli._OUTPUT_HISTORY)
|
|
|
|
|
|
def test_suspend_output_history_blocks_recording():
|
|
cli._configure_output_history(True, 10)
|
|
|
|
with cli._suspend_output_history():
|
|
cli._record_output_history("hidden")
|
|
cli._record_output_history_entry("also hidden")
|
|
|
|
assert list(cli._OUTPUT_HISTORY) == []
|
|
|
|
|
|
def test_clear_output_history_removes_replayable_lines():
|
|
cli._configure_output_history(True, 10)
|
|
cli._record_output_history("before clear")
|
|
|
|
cli._clear_output_history()
|
|
|
|
assert list(cli._OUTPUT_HISTORY) == []
|