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.
103 lines
3.2 KiB
Python
103 lines
3.2 KiB
Python
"""Tests for CLI background command TUI refresh behavior.
|
|
|
|
Ensures the TUI is properly refreshed before printing background task output
|
|
to prevent spinner/status bar overlap (#2718).
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
|
|
from cli import HermesCLI
|
|
|
|
|
|
def _make_cli():
|
|
"""Create a minimal HermesCLI instance for testing."""
|
|
cli_obj = HermesCLI.__new__(HermesCLI)
|
|
cli_obj.model = "test-model"
|
|
cli_obj._background_tasks = {}
|
|
cli_obj._background_task_counter = 0
|
|
cli_obj.conversation_history = []
|
|
cli_obj.agent = None
|
|
cli_obj._app = None
|
|
return cli_obj
|
|
|
|
|
|
class TestBackgroundCommandTuiRefresh:
|
|
"""Tests for TUI refresh in background command output."""
|
|
|
|
def test_invalidate_called_before_success_output(self):
|
|
"""App.invalidate() is called before printing background success output."""
|
|
cli_obj = _make_cli()
|
|
mock_app = MagicMock()
|
|
cli_obj._app = mock_app
|
|
|
|
# Track call order
|
|
call_order = []
|
|
original_invalidate = mock_app.invalidate
|
|
|
|
def track_invalidate():
|
|
call_order.append("invalidate")
|
|
return original_invalidate()
|
|
|
|
mock_app.invalidate = track_invalidate
|
|
|
|
# Patch print to track when it's called
|
|
with patch("builtins.print") as mock_print:
|
|
mock_print.side_effect = lambda *args, **kwargs: call_order.append("print")
|
|
|
|
# Simulate the background task output code path
|
|
if cli_obj._app:
|
|
cli_obj._app.invalidate()
|
|
import time
|
|
time.sleep(0.01) # reduced for test
|
|
print()
|
|
|
|
# Verify invalidate was called before print
|
|
assert call_order[0] == "invalidate"
|
|
assert "print" in call_order
|
|
|
|
def test_invalidate_called_before_error_output(self):
|
|
"""App.invalidate() is called before printing background error output."""
|
|
cli_obj = _make_cli()
|
|
mock_app = MagicMock()
|
|
cli_obj._app = mock_app
|
|
|
|
call_order = []
|
|
mock_app.invalidate.side_effect = lambda: call_order.append("invalidate")
|
|
|
|
with patch("builtins.print") as mock_print:
|
|
mock_print.side_effect = lambda *args, **kwargs: call_order.append("print")
|
|
|
|
# Simulate error path
|
|
if cli_obj._app:
|
|
cli_obj._app.invalidate()
|
|
import time
|
|
time.sleep(0.01)
|
|
print()
|
|
|
|
assert call_order[0] == "invalidate"
|
|
assert "print" in call_order
|
|
|
|
def test_no_crash_when_app_is_none(self):
|
|
"""No crash when _app is None (non-TUI mode)."""
|
|
cli_obj = _make_cli()
|
|
cli_obj._app = None
|
|
|
|
# This should not raise
|
|
if cli_obj._app:
|
|
cli_obj._app.invalidate()
|
|
# If we get here without exception, test passes
|
|
|
|
def test_background_task_thread_safety(self):
|
|
"""Background task tracking is thread-safe."""
|
|
cli_obj = _make_cli()
|
|
|
|
# Simulate adding and removing background tasks
|
|
task_id = "test_task_1"
|
|
cli_obj._background_tasks[task_id] = MagicMock()
|
|
assert task_id in cli_obj._background_tasks
|
|
|
|
# Clean up
|
|
cli_obj._background_tasks.pop(task_id, None)
|
|
assert task_id not in cli_obj._background_tasks
|