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.
104 lines
4.0 KiB
Python
104 lines
4.0 KiB
Python
"""Regression tests for delegate-child cascade collection (#49148).
|
|
|
|
`_collect_delegate_child_ids` walks the ``_delegate_from`` marker chain to
|
|
find delegate subagents that should be cascade-deleted with their parent.
|
|
The parents themselves are deleted separately by the callers, so they must
|
|
never appear in the collected child set. A delegation cycle (or a parent
|
|
that is also another parent's delegate child) used to leak the parent into
|
|
the deletion set, permanently deleting the parent session and its messages.
|
|
"""
|
|
|
|
import json
|
|
import sqlite3
|
|
|
|
from hermes_state_sessions import _collect_delegate_child_ids, _delete_delegate_children
|
|
|
|
|
|
def _make_conn():
|
|
conn = sqlite3.connect(":memory:")
|
|
conn.row_factory = sqlite3.Row
|
|
conn.execute(
|
|
"CREATE TABLE sessions ("
|
|
" id TEXT PRIMARY KEY,"
|
|
" parent_session_id TEXT,"
|
|
" model_config TEXT)"
|
|
)
|
|
conn.execute("CREATE TABLE messages (session_id TEXT)")
|
|
return conn
|
|
|
|
|
|
def _add_session(conn, sid, *, delegate_from=None, parent_session_id=None, messages=0):
|
|
model_config = json.dumps({"_delegate_from": delegate_from}) if delegate_from else None
|
|
conn.execute(
|
|
"INSERT INTO sessions (id, parent_session_id, model_config) VALUES (?, ?, ?)",
|
|
(sid, parent_session_id, model_config),
|
|
)
|
|
for _ in range(messages):
|
|
conn.execute("INSERT INTO messages (session_id) VALUES (?)", (sid,))
|
|
|
|
|
|
class TestCollectDelegateChildIds:
|
|
def test_collects_delegate_child_excludes_parent(self):
|
|
conn = _make_conn()
|
|
_add_session(conn, "P")
|
|
_add_session(conn, "C", delegate_from="P")
|
|
|
|
result = _collect_delegate_child_ids(conn, ["P"])
|
|
|
|
assert "C" in result
|
|
assert "P" not in result
|
|
|
|
def test_multilevel_chain_collects_all_descendants(self):
|
|
conn = _make_conn()
|
|
_add_session(conn, "O")
|
|
_add_session(conn, "A", delegate_from="O")
|
|
_add_session(conn, "B", delegate_from="A")
|
|
|
|
result = set(_collect_delegate_child_ids(conn, ["O"]))
|
|
|
|
assert result == {"A", "B"} # parent O excluded, both descendants in
|
|
|
|
def test_parent_session_id_branch_with_marker_collected(self):
|
|
# Second OR clause: parent_session_id match AND _delegate_from present.
|
|
conn = _make_conn()
|
|
_add_session(conn, "P")
|
|
_add_session(conn, "C", parent_session_id="P", delegate_from="something")
|
|
|
|
assert _collect_delegate_child_ids(conn, ["P"]) == ["C"]
|
|
|
|
def test_untagged_child_not_collected(self):
|
|
# No _delegate_from marker -> orphan-don't-delete contract.
|
|
conn = _make_conn()
|
|
_add_session(conn, "P")
|
|
_add_session(conn, "C", parent_session_id="P")
|
|
|
|
assert _collect_delegate_child_ids(conn, ["P"]) == []
|
|
|
|
def test_cycle_terminates_and_excludes_parent(self):
|
|
# The #49148 bug: A and B reference each other via _delegate_from.
|
|
# Collection must terminate and never return the seed parent A.
|
|
conn = _make_conn()
|
|
_add_session(conn, "A", delegate_from="B")
|
|
_add_session(conn, "B", delegate_from="A")
|
|
|
|
result = _collect_delegate_child_ids(conn, ["A"])
|
|
|
|
assert "A" not in result # parent never collected as its own child
|
|
assert result == ["B"]
|
|
|
|
|
|
class TestDeleteDelegateChildrenPreservesParent:
|
|
def test_cycle_does_not_delete_parent_or_its_messages(self):
|
|
conn = _make_conn()
|
|
_add_session(conn, "A", delegate_from="B", messages=3)
|
|
_add_session(conn, "B", delegate_from="A", messages=2)
|
|
|
|
removed = _delete_delegate_children(conn, ["A"])
|
|
|
|
assert "A" not in removed
|
|
# Parent A and its messages survive; only delegate child B is gone.
|
|
assert conn.execute("SELECT COUNT(*) FROM sessions WHERE id='A'").fetchone()[0] == 1
|
|
assert conn.execute("SELECT COUNT(*) FROM messages WHERE session_id='A'").fetchone()[0] == 3
|
|
assert conn.execute("SELECT COUNT(*) FROM sessions WHERE id='B'").fetchone()[0] == 0
|
|
assert conn.execute("SELECT COUNT(*) FROM messages WHERE session_id='B'").fetchone()[0] == 0
|