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.
41 lines
1.6 KiB
Python
41 lines
1.6 KiB
Python
"""Contract test: install.sh stamps the install method next to the code tree
|
|
($INSTALL_DIR), not into the shared $HERMES_HOME.
|
|
|
|
Background (shared-$HERMES_HOME bug)
|
|
------------------------------------
|
|
$HERMES_HOME is a data directory users frequently bind-mount into a Docker
|
|
gateway as well (``~/.hermes:/opt/data``). The published image stamps 'docker'
|
|
there on boot, so if install.sh had written its 'git' marker into the same
|
|
$HERMES_HOME the two installs would fight over one slot — and the container,
|
|
booting last, would win and wrongly make the host install look like 'docker'
|
|
(blocking ``hermes update``).
|
|
|
|
The fix: detect_install_method() reads a CODE-scoped stamp first, and the
|
|
installer writes ``git`` into $INSTALL_DIR (the git checkout, e.g.
|
|
``~/.hermes/hermes-agent``), which is unique to this install and immune to the
|
|
shared data dir.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
from pathlib import Path
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent
|
|
INSTALL_SH = REPO_ROOT / "scripts" / "install.sh"
|
|
|
|
|
|
def test_install_sh_stamps_code_tree_not_home() -> None:
|
|
text = INSTALL_SH.read_text()
|
|
|
|
# Stamps the code tree.
|
|
assert text.count('echo "git" > "$INSTALL_DIR/.install_method"') >= 1, (
|
|
"install.sh must stamp $INSTALL_DIR/.install_method (code-scoped)"
|
|
)
|
|
|
|
# Never stamps the shared data dir.
|
|
assert not re.search(r'>\s*"\$HERMES_HOME/\.install_method"', text), (
|
|
"install.sh must not stamp $HERMES_HOME/.install_method — that data "
|
|
"dir may be shared with a Docker gateway whose 'docker' stamp would "
|
|
"clobber it and block host-side `hermes update`"
|
|
)
|