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.
77 lines
2.2 KiB
Python
77 lines
2.2 KiB
Python
"""Regression coverage for CLI async-delegation completion ownership."""
|
|
|
|
import queue
|
|
|
|
from cli import HermesCLI
|
|
|
|
|
|
def test_cli_completion_drain_uses_visible_session_identity(monkeypatch):
|
|
"""A CLI window must not claim another window's restored completion."""
|
|
cli = HermesCLI.__new__(HermesCLI)
|
|
cli.session_id = "visible-session"
|
|
cli._pending_input = queue.Queue()
|
|
|
|
event = {
|
|
"type": "async_delegation",
|
|
"delegation_id": "deleg_visible",
|
|
"session_key": "visible-session",
|
|
}
|
|
calls = []
|
|
|
|
class FakeRegistry:
|
|
def drain_notifications(self, *, session_key="", owns_event=None):
|
|
calls.append((session_key, owns_event(event)))
|
|
return [(event, "completion payload")]
|
|
|
|
claimed = []
|
|
completed = []
|
|
|
|
monkeypatch.setattr(
|
|
"tools.process_registry.process_registry",
|
|
FakeRegistry(),
|
|
)
|
|
monkeypatch.setattr(
|
|
"tools.async_delegation.claim_event_delivery",
|
|
lambda evt, consumer: claimed.append((evt, consumer)) or "claim-token",
|
|
)
|
|
monkeypatch.setattr(
|
|
"tools.async_delegation.complete_event_delivery",
|
|
lambda evt, token: completed.append((evt, token)),
|
|
)
|
|
|
|
cli._drain_process_notifications("cli-idle")
|
|
|
|
assert calls == [("visible-session", True)]
|
|
assert cli._pending_input.get_nowait() == "completion payload"
|
|
assert claimed == [(event, "cli-idle")]
|
|
assert completed == [(event, "claim-token")]
|
|
|
|
|
|
def test_cli_completion_ownership_rejects_foreign_session():
|
|
cli = HermesCLI.__new__(HermesCLI)
|
|
cli.session_id = "visible-session"
|
|
cli._session_db = None
|
|
|
|
assert not cli._owns_process_notification(
|
|
{"type": "async_delegation", "session_key": "foreign-session"}
|
|
)
|
|
|
|
|
|
def test_cli_completion_ownership_accepts_compression_lineage():
|
|
cli = HermesCLI.__new__(HermesCLI)
|
|
cli.session_id = "visible-session"
|
|
|
|
class FakeSessionDB:
|
|
def resolve_resume_session_id(self, session_id):
|
|
assert session_id == "pre-compression-session"
|
|
return "visible-session"
|
|
|
|
cli._session_db = FakeSessionDB()
|
|
|
|
assert cli._owns_process_notification(
|
|
{
|
|
"type": "async_delegation",
|
|
"session_key": "pre-compression-session",
|
|
}
|
|
)
|