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.
93 lines
4.3 KiB
Python
93 lines
4.3 KiB
Python
"""Collapsing the passive dock never takes space or focus from the editor."""
|
|
import asyncio
|
|
from types import SimpleNamespace
|
|
|
|
|
|
def test_collapsed_dock_reserves_one_shaded_row_without_changing_editor():
|
|
from prompt_toolkit.application import Application
|
|
from prompt_toolkit.data_structures import Size
|
|
from prompt_toolkit.document import Document
|
|
from prompt_toolkit.input import create_pipe_input
|
|
from prompt_toolkit.layout import HSplit, Layout
|
|
from prompt_toolkit.output import DummyOutput
|
|
from prompt_toolkit.styles import Style
|
|
from prompt_toolkit.widgets import TextArea
|
|
from hermes_cli import cli_subagent_monitor as dock
|
|
from hermes_cli.skin_engine import get_prompt_toolkit_style_overrides
|
|
|
|
cli = SimpleNamespace(agent=None)
|
|
dock.install_dock(cli)
|
|
monitor = cli._subagent_monitor
|
|
monitor.entries = [dict(subagent_id=str(i), goal='Worker 界 ' * 20,
|
|
elapsed=12, last_tool='terminal', status='running') for i in range(6)]
|
|
submitted = []
|
|
editor = TextArea(height=1, multiline=False,
|
|
accept_handler=lambda buffer: submitted.append(buffer.text))
|
|
output = DummyOutput()
|
|
|
|
async def run():
|
|
with create_pipe_input() as pipe:
|
|
app = Application(layout=Layout(HSplit([cli._subagent_dock_widget, editor]),
|
|
focused_element=editor), input=pipe, output=output,
|
|
style=Style.from_dict(get_prompt_toolkit_style_overrides()))
|
|
cli._invalidate = app.invalidate
|
|
painted = asyncio.Event()
|
|
app.after_render += lambda _: painted.set()
|
|
output.get_size = lambda: Size(rows=30, columns=100)
|
|
task = asyncio.create_task(app.run_async())
|
|
await asyncio.wait_for(painted.wait(), 3)
|
|
try:
|
|
def height():
|
|
return app.renderer._last_screen.visible_windows_to_write_positions[editor.window].ypos
|
|
|
|
preview_height = height()
|
|
assert preview_height > 1
|
|
editor.buffer.document = Document('keep this draft', 5)
|
|
dock.toggle_dock(cli)
|
|
for columns, rows in [(100, 30), (80, 20), (40, 14)]:
|
|
output.get_size = lambda: Size(rows=rows, columns=columns)
|
|
painted.clear()
|
|
app.invalidate()
|
|
await asyncio.wait_for(painted.wait(), 3)
|
|
assert height() == 1
|
|
assert app.layout.has_focus(editor)
|
|
assert (editor.text, editor.buffer.cursor_position) == ('keep this draft', 5)
|
|
screen = app.renderer._last_screen
|
|
for x in (0, columns // 2, columns - 1):
|
|
attrs = app._merged_style.get_attrs_for_style_str(screen.data_buffer[0][x].style)
|
|
assert attrs.bgcolor and attrs.color != attrs.bgcolor
|
|
painted.clear()
|
|
pipe.send_text('X\r')
|
|
await asyncio.wait_for(painted.wait(), 3)
|
|
assert submitted == ['keep Xthis draft']
|
|
assert height() == 1
|
|
output.get_size = lambda: Size(rows=30, columns=100)
|
|
painted.clear()
|
|
dock.toggle_dock(cli)
|
|
await asyncio.wait_for(painted.wait(), 3)
|
|
assert height() == preview_height
|
|
finally:
|
|
app.exit()
|
|
await task
|
|
asyncio.run(run())
|
|
|
|
|
|
def test_collapsed_summary_prioritizes_live_count_and_controls_at_small_widths():
|
|
from prompt_toolkit.utils import get_cwidth
|
|
from hermes_cli.cli_subagent_monitor import SubagentMonitor
|
|
|
|
monitor = SubagentMonitor(SimpleNamespace())
|
|
monitor.entries = [dict(goal='Inspect 界 ' * 40, elapsed=12,
|
|
last_tool='terminal', status='running') for _ in range(6)]
|
|
monitor.collapsed = True
|
|
for width in (100, 80, 40, 24, 10, 1):
|
|
text = monitor.dock_text(columns=width, rows=20)
|
|
assert len(text.splitlines()) == 1
|
|
assert get_cwidth(text) <= width
|
|
if width >= 24:
|
|
assert '6 live' in text and 'Ctrl+T' in text and 'F7' in text
|
|
if width >= 80:
|
|
assert 'last: terminal' in text and 'Ctrl+T expand' in text and 'F7 restore' in text
|
|
monitor.entries.clear()
|
|
assert monitor.dock_text(columns=80, rows=20) == ''
|