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.
177 lines
5.4 KiB
Python
177 lines
5.4 KiB
Python
"""Tests for the /bg indicator in the CLI status bar.
|
|
|
|
The classic prompt_toolkit status bar shows `▶ N` when N tasks launched via
|
|
`/bg` are still running. Source of truth is `self._background_tasks`
|
|
(a Dict[str, threading.Thread]); entries are removed in the task thread's
|
|
finally block, so len() reflects truly-running tasks.
|
|
"""
|
|
|
|
import threading
|
|
from datetime import datetime
|
|
|
|
from cli import HermesCLI
|
|
|
|
|
|
def _stub_thread() -> threading.Thread:
|
|
"""Return a Thread instance that's never started — pure dict-value stand-in."""
|
|
return threading.Thread(target=lambda: None)
|
|
|
|
|
|
def _make_cli():
|
|
"""Bare-metal HermesCLI for snapshot/build tests (no __init__ side effects)."""
|
|
cli_obj = HermesCLI.__new__(HermesCLI)
|
|
cli_obj.model = "anthropic/claude-opus-4.6"
|
|
cli_obj.agent = None
|
|
cli_obj._background_tasks = {}
|
|
# The snapshot reads session_start to compute duration; supply a stub.
|
|
cli_obj.session_start = datetime.now()
|
|
return cli_obj
|
|
|
|
|
|
def test_snapshot_reports_zero_when_no_background_tasks():
|
|
cli_obj = _make_cli()
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_tasks"] == 0
|
|
|
|
|
|
def test_snapshot_counts_live_background_tasks():
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {"bg_a": _stub_thread(), "bg_b": _stub_thread()}
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_tasks"] == 2
|
|
|
|
|
|
|
|
|
|
def test_plain_text_status_omits_indicator_when_idle():
|
|
cli_obj = _make_cli()
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "▶" not in text
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_fragments_omit_bg_segment_when_idle():
|
|
cli_obj = _make_cli()
|
|
cli_obj._status_bar_visible = True
|
|
cli_obj._get_tui_terminal_width = lambda: 120 # type: ignore[method-assign]
|
|
frags = cli_obj._get_status_bar_fragments()
|
|
rendered = "".join(text for _style, text in frags)
|
|
assert "▶" not in rendered
|
|
|
|
|
|
# ── Background terminal-process indicator (⚙ N) ───────────────────────────
|
|
# Source of truth is tools.process_registry.process_registry._running (a dict
|
|
# of currently-running shell processes spawned by terminal(background=true)).
|
|
# Distinct from /bg tasks above: ▶ counts agent threads, ⚙ counts
|
|
# shell processes. Both can be active simultaneously.
|
|
|
|
|
|
class _FakeRunningRegistry:
|
|
"""Minimal stand-in for process_registry; exposes count_running()."""
|
|
|
|
def __init__(self, count: int) -> None:
|
|
self._count = count
|
|
|
|
def count_running(self) -> int:
|
|
return self._count
|
|
|
|
|
|
def _patch_process_registry(monkeypatch, count: int) -> None:
|
|
import tools.process_registry as pr_mod
|
|
monkeypatch.setattr(pr_mod, "process_registry", _FakeRunningRegistry(count))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ── Background/async subagent indicator (⛓ N) ─────────────────────────────
|
|
# Source of truth is tools.async_delegation.active_count() — the count of
|
|
# delegate_task delegations (batch + background single) still in the
|
|
# "running" state. Distinct from ▶ (/bg agent threads) and ⚙ (shell
|
|
# processes); all three can be active at once.
|
|
|
|
|
|
def _patch_async_active(monkeypatch, count: int) -> None:
|
|
import tools.async_delegation as ad_mod
|
|
monkeypatch.setattr(ad_mod, "active_count", lambda: count)
|
|
|
|
|
|
def test_snapshot_reports_zero_when_no_background_subagents(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_async_active(monkeypatch, 0)
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_subagents"] == 0
|
|
|
|
|
|
|
|
|
|
def test_snapshot_safe_when_async_active_count_raises(monkeypatch):
|
|
"""If active_count() raises the snapshot stays at 0; no propagate."""
|
|
cli_obj = _make_cli()
|
|
import tools.async_delegation as ad_mod
|
|
|
|
def _boom():
|
|
raise RuntimeError("boom")
|
|
|
|
monkeypatch.setattr(ad_mod, "active_count", _boom)
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_subagents"] == 0
|
|
|
|
|
|
def test_plain_text_status_shows_subagent_indicator_when_active(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_async_active(monkeypatch, 3)
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "⛓ 3" in text
|
|
|
|
|
|
def test_plain_text_status_omits_subagent_indicator_when_idle(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_async_active(monkeypatch, 0)
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "⛓" not in text
|
|
|
|
|
|
def test_fragments_include_subagent_segment_when_active(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_async_active(monkeypatch, 2)
|
|
cli_obj._status_bar_visible = True
|
|
cli_obj._get_tui_terminal_width = lambda: 120 # type: ignore[method-assign]
|
|
frags = cli_obj._get_status_bar_fragments()
|
|
rendered = "".join(text for _style, text in frags)
|
|
assert "⛓ 2" in rendered
|
|
|
|
|
|
def test_all_three_background_indicators_independent(monkeypatch):
|
|
"""▶ (agent tasks), ⚙ (shell processes), ⛓ (subagents) all coexist."""
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {"bg_a": _stub_thread()}
|
|
_patch_process_registry(monkeypatch, 2)
|
|
_patch_async_active(monkeypatch, 5)
|
|
cli_obj._status_bar_visible = True
|
|
cli_obj._get_tui_terminal_width = lambda: 120 # type: ignore[method-assign]
|
|
frags = cli_obj._get_status_bar_fragments()
|
|
rendered = "".join(text for _style, text in frags)
|
|
assert "▶ 1" in rendered
|
|
assert "⚙ 2" in rendered
|
|
assert "⛓ 5" in rendered
|
|
|