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.
90 lines
2.7 KiB
Python
90 lines
2.7 KiB
Python
"""Regression coverage for the user-facing macOS Hermes launcher."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re
|
|
import shutil
|
|
import stat
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parent.parent.parent.parent
|
|
INSTALL_SH = REPO_ROOT / "scripts" / "install.sh"
|
|
|
|
|
|
def _make_executable(path: Path, content: str) -> None:
|
|
path.write_text(content, encoding="utf-8")
|
|
path.chmod(path.stat().st_mode | stat.S_IXUSR)
|
|
|
|
|
|
def _setup_path_function() -> str:
|
|
match = re.search(
|
|
r"^setup_path\(\) \{\n.*?^}\n",
|
|
INSTALL_SH.read_text(encoding="utf-8"),
|
|
re.MULTILINE | re.DOTALL,
|
|
)
|
|
assert match is not None, "setup_path function not found in scripts/install.sh"
|
|
return match.group(0)
|
|
|
|
|
|
def test_venv_launcher_bypasses_uv_console_script_that_requires_realpath(tmp_path: Path) -> None:
|
|
"""Stock macOS must start Hermes even when its uv console script needs realpath."""
|
|
install_dir = tmp_path / "install"
|
|
venv_bin = install_dir / "venv" / "bin"
|
|
command_dir = tmp_path / "command"
|
|
minimal_path = tmp_path / "minimal-path"
|
|
result = tmp_path / "launch-result"
|
|
venv_bin.mkdir(parents=True)
|
|
minimal_path.mkdir()
|
|
|
|
dirname = shutil.which("dirname")
|
|
assert dirname is not None
|
|
(minimal_path / "dirname").symlink_to(dirname)
|
|
|
|
_make_executable(
|
|
venv_bin / "python",
|
|
'#!/bin/sh\nprintf "%s\\n" "$@" > "$LAUNCH_RESULT"\n',
|
|
)
|
|
(install_dir / "hermes").write_text("# source entrypoint\n", encoding="utf-8")
|
|
_make_executable(
|
|
venv_bin / "hermes",
|
|
"#!/bin/sh\n"
|
|
f'PATH="{minimal_path}"\n'
|
|
"'''exec' \"$(dirname -- \"$(realpath -- \"$0\")\")\"/'python3' \"$0\" \"$@\"\n"
|
|
"' '''\n",
|
|
)
|
|
|
|
harness = "\n".join(
|
|
[
|
|
"set -e",
|
|
'get_command_link_dir() { printf "%s" "$COMMAND_LINK_DIR"; }',
|
|
'get_command_link_display_dir() { printf "%s" "$COMMAND_LINK_DIR"; }',
|
|
"log_info() { :; }",
|
|
"log_success() { :; }",
|
|
_setup_path_function(),
|
|
"setup_path",
|
|
]
|
|
)
|
|
env = os.environ | {
|
|
"USE_VENV": "true",
|
|
"INSTALL_DIR": str(install_dir),
|
|
"DISTRO": "macos",
|
|
"COMMAND_LINK_DIR": str(command_dir),
|
|
}
|
|
subprocess.run(["/bin/bash", "-c", harness], env=env, check=True)
|
|
|
|
completed = subprocess.run(
|
|
[command_dir / "hermes", "--version"],
|
|
env=os.environ | {"LAUNCH_RESULT": str(result)},
|
|
text=True,
|
|
capture_output=True,
|
|
)
|
|
|
|
assert completed.returncode == 0, completed.stderr
|
|
assert result.read_text(encoding="utf-8").splitlines() == [
|
|
str(install_dir / "hermes"),
|
|
"--version",
|
|
]
|