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.
60 lines
2.3 KiB
Python
60 lines
2.3 KiB
Python
"""The linux relaunch gate must compare canonical paths, not spellings.
|
|
|
|
``--install-root`` keeps whatever spelling the app's Hermes root had (a symlinked
|
|
``~/.hermes/hermes-agent``, or ``/home`` on Fedora/ostree where it is a link to
|
|
``/var/home``), while ``--relaunch-target`` comes from ``process.execPath`` /
|
|
``/proc/<pid>/exe`` and is already resolved. A raw prefix compare then reads the
|
|
binary the rebuild just replaced as a foreign AppImage/deb and refuses to relaunch.
|
|
|
|
Drives the real ``--self-test-gate`` entry point of ``posix.sh`` (the same one
|
|
``scripts/desktop-update/repro.sh gate`` uses).
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
POSIX_SH = Path(__file__).resolve().parent.parent.parent.parent / "scripts" / "desktop-update" / "posix.sh"
|
|
|
|
pytestmark = pytest.mark.linux_only
|
|
|
|
|
|
def _gate(install_root: Path, relaunch_target: Path) -> str:
|
|
out = subprocess.run(
|
|
["bash", str(POSIX_SH), "--self-test-gate", "--install-root", str(install_root),
|
|
"--relaunch-target", str(relaunch_target)],
|
|
capture_output=True, text=True, check=True,
|
|
)
|
|
return out.stdout.strip().split(":", 1)[0]
|
|
|
|
|
|
def _checkout(root: Path) -> Path:
|
|
unpacked = root / "apps" / "desktop" / "release" / "linux-unpacked"
|
|
unpacked.mkdir(parents=True)
|
|
(unpacked / "Hermes").touch()
|
|
return unpacked
|
|
|
|
|
|
@pytest.mark.parametrize("root_spelling,target_spelling", [("link", "real"), ("real", "link")])
|
|
def test_symlinked_spelling_on_either_side_still_relaunches(tmp_path, root_spelling, target_spelling):
|
|
real = tmp_path / "real"
|
|
_checkout(real)
|
|
(tmp_path / "link").symlink_to(real)
|
|
root = tmp_path / root_spelling
|
|
target = tmp_path / target_spelling / "apps" / "desktop" / "release" / "linux-unpacked" / "Hermes"
|
|
assert _gate(root, target) == "relaunch"
|
|
|
|
|
|
def test_target_outside_the_checkout_is_still_skew(tmp_path):
|
|
real = tmp_path / "real"
|
|
unpacked = _checkout(real)
|
|
(tmp_path / "link").symlink_to(real)
|
|
foreign = tmp_path / "opt" / "Hermes"
|
|
foreign.mkdir(parents=True)
|
|
(foreign / "hermes").touch()
|
|
assert _gate(tmp_path / "link", foreign / "hermes") == "skew"
|
|
# A sibling directory sharing the prefix must not be mistaken for the checkout either.
|
|
assert _gate(tmp_path / "link", Path(str(unpacked) + "-evil") / "Hermes") == "skew"
|