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.
78 lines
2.9 KiB
Python
78 lines
2.9 KiB
Python
"""The conftest WAL gate must agree with hermes_state, and must not import it.
|
|
|
|
``tests/conftest.py::_wal_is_usable`` duplicates the SQLite WAL-reset version
|
|
predicate instead of importing ``hermes_state``. That is deliberate: importing
|
|
``hermes_state`` during collection caches ``DEFAULT_DB_PATH`` from the real
|
|
``~/.hermes`` before the per-test ``HERMES_HOME`` redirect, which makes tests
|
|
read the developer's live production database.
|
|
|
|
Duplication needs a guard, so these tests pin the two implementations in
|
|
agreement across the documented upstream boundaries.
|
|
"""
|
|
|
|
import sqlite3
|
|
|
|
import pytest
|
|
|
|
from hermes_state_wal import is_sqlite_wal_reset_vulnerable
|
|
from tests.conftest import _wal_is_usable
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"version_info",
|
|
[
|
|
(3, 6, 23), # pre-WAL
|
|
(3, 7, 0), # first WAL release — vulnerable
|
|
(3, 44, 5), # below the 3.44 backport
|
|
(3, 44, 6), # 3.44 backport — fixed
|
|
(3, 45, 0), # next minor, back to vulnerable
|
|
(3, 50, 4), # the version that exposed this (repo .venv)
|
|
(3, 50, 6), # below the 3.50 backport
|
|
(3, 50, 7), # 3.50 backport — fixed
|
|
(3, 51, 2), # last vulnerable
|
|
(3, 51, 3), # fixed upstream
|
|
(3, 53, 1), # the managed runtime
|
|
],
|
|
)
|
|
def test_conftest_gate_agrees_with_hermes_state(version_info, monkeypatch):
|
|
"""``_wai_is_usable`` must be the exact inverse of the canonical predicate."""
|
|
monkeypatch.setattr(sqlite3, "sqlite_version_info", version_info)
|
|
assert _wal_is_usable() is not is_sqlite_wal_reset_vulnerable(version_info), (
|
|
f"conftest gate and hermes_state disagree for SQLite {version_info}"
|
|
)
|
|
|
|
|
|
def test_conftest_does_not_import_hermes_state_at_collection():
|
|
"""The gate must stay import-free of hermes_state.
|
|
|
|
Importing it during collection caches DEFAULT_DB_PATH from the real
|
|
~/.hermes, so tests read live production sessions instead of a tempdir.
|
|
Reading the source is not an option here (banned), so assert on behavior:
|
|
the gate must work with ``hermes_state`` absent from ``sys.modules`` and
|
|
blocked from being imported.
|
|
"""
|
|
import builtins
|
|
import sys
|
|
|
|
real_import = builtins.__import__
|
|
blocked: list[str] = []
|
|
|
|
def guard(name, *args, **kwargs):
|
|
if name == "hermes_state" or name.startswith("hermes_state."):
|
|
blocked.append(name)
|
|
raise AssertionError(
|
|
"conftest._wal_is_usable imported hermes_state — this caches "
|
|
"DEFAULT_DB_PATH from the real ~/.hermes during collection"
|
|
)
|
|
return real_import(name, *args, **kwargs)
|
|
|
|
saved = sys.modules.pop("hermes_state", None)
|
|
builtins.__import__ = guard
|
|
try:
|
|
_wal_is_usable() # must not raise
|
|
finally:
|
|
builtins.__import__ = real_import
|
|
if saved is not None:
|
|
sys.modules["hermes_state"] = saved
|
|
assert not blocked
|