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.
45 lines
2.0 KiB
Python
45 lines
2.0 KiB
Python
"""Batched context preserves neighboring rows and projection fast paths."""
|
|
|
|
from hermes_state import SessionDB
|
|
|
|
|
|
def test_search_context_batches_hits_without_cross_session_neighbors(tmp_path):
|
|
with SessionDB(db_path=tmp_path / "search.db") as db:
|
|
for sid in ("one", "two"):
|
|
db.create_session(sid, "cli")
|
|
for i in range(5):
|
|
db.append_message(sid, "user", f"{sid} needleprobe {i}")
|
|
sql = []
|
|
with db._read_ctx() as conn:
|
|
conn.set_trace_callback(sql.append)
|
|
rows = db.search_messages("needleprobe", limit=20)
|
|
assert len(rows) == 10
|
|
for row in rows:
|
|
contents = [r["content"] for r in row["context"]]
|
|
assert all(c.startswith(row["session_id"]) for c in contents)
|
|
indices = [int(c.rsplit(" ", 1)[1]) for c in contents]
|
|
assert indices == list(range(indices[0], indices[-1] + 1))
|
|
assert len(indices) in (2, 3)
|
|
assert sum("WITH target AS" in q for q in sql) == 1
|
|
sql.clear()
|
|
projected = db.search_messages("needleprobe", fields=["id"], limit=20)
|
|
assert len(projected) == len(rows)
|
|
assert not any("WITH target AS" in q for q in sql)
|
|
|
|
|
|
def test_context_batches_keep_tied_timestamp_order_and_duplicate_hits(tmp_path):
|
|
with SessionDB(db_path=tmp_path / "ties.db") as db:
|
|
db.create_session("ties", "cli")
|
|
db.append_messages_batch("ties", [
|
|
{"role": "user", "content": f"needleprobe {i}", "timestamp": 10.0}
|
|
for i in range(502)
|
|
])
|
|
rows = db.search_messages("needleprobe", limit=502)
|
|
assert len(rows) == 502
|
|
by_id = sorted(rows, key=lambda row: row["id"])
|
|
for i, row in enumerate(by_id):
|
|
expected = [f"needleprobe {j}" for j in range(max(0, i - 1), min(502, i + 2))]
|
|
assert [r["content"] for r in row["context"]] == expected
|
|
duplicate = db._finalize_search_matches([dict(by_id[250]), dict(by_id[250])])
|
|
assert duplicate[0]["context"] == duplicate[1]["context"] == by_id[250]["context"]
|