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.
93 lines
2.6 KiB
Python
93 lines
2.6 KiB
Python
"""Unit tests for docker/tini-shim.sh argument stripping (#66679).
|
|
|
|
These run without Docker: the shim's HERMES_TINI_SHIM_TARGET /
|
|
HERMES_TINI_SHIM_WRAPPER hooks let us record the argv that would be
|
|
handed to /init.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[2]
|
|
SHIM = REPO_ROOT / "docker" / "tini-shim.sh"
|
|
|
|
|
|
@pytest.fixture
|
|
def recorder(tmp_path: Path) -> tuple[Path, Path]:
|
|
"""Fake /init + wrapper that print argv, one token per line."""
|
|
init = tmp_path / "fake-init"
|
|
wrapper = tmp_path / "fake-wrapper"
|
|
init.write_text("#!/bin/sh\nprintf '%s\\n' \"$@\"\n")
|
|
wrapper.write_text("#!/bin/sh\nprintf 'wrapper\\n'\n")
|
|
init.chmod(0o755)
|
|
wrapper.chmod(0o755)
|
|
return init, wrapper
|
|
|
|
|
|
def _run_shim(
|
|
recorder: tuple[Path, Path],
|
|
args: list[str],
|
|
) -> subprocess.CompletedProcess[str]:
|
|
init, wrapper = recorder
|
|
env = os.environ.copy()
|
|
env["HERMES_TINI_SHIM_TARGET"] = str(init)
|
|
env["HERMES_TINI_SHIM_WRAPPER"] = str(wrapper)
|
|
return subprocess.run(
|
|
["sh", str(SHIM), *args],
|
|
capture_output=True,
|
|
text=True,
|
|
timeout=10,
|
|
env=env,
|
|
check=False,
|
|
)
|
|
|
|
|
|
def test_shim_script_is_executable_bit_friendly() -> None:
|
|
assert SHIM.is_file()
|
|
text = SHIM.read_text()
|
|
assert text.startswith("#!/bin/sh")
|
|
assert "HERMES_TINI_SHIM_TARGET" in text
|
|
|
|
|
|
def test_strips_g_and_double_dash(recorder: tuple[Path, Path]) -> None:
|
|
"""Legacy `tini -g -- gateway run` must not forward `-g` to /init."""
|
|
r = _run_shim(recorder, ["-g", "--", "gateway", "run"])
|
|
assert r.returncode == 0, r.stderr
|
|
lines = [ln for ln in r.stdout.splitlines() if ln]
|
|
init, wrapper = recorder
|
|
assert lines[0] == str(wrapper)
|
|
assert lines[1:] == ["gateway", "run"]
|
|
assert "-g" not in lines
|
|
assert "--" not in lines
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_does_not_double_wrap_existing_wrapper(
|
|
recorder: tuple[Path, Path],
|
|
) -> None:
|
|
_, wrapper = recorder
|
|
r = _run_shim(recorder, ["-g", "--", str(wrapper), "gateway", "run"])
|
|
assert r.returncode == 0, r.stderr
|
|
lines = [ln for ln in r.stdout.splitlines() if ln]
|
|
assert lines == [str(wrapper), "gateway", "run"]
|
|
|
|
|
|
def test_strips_p_and_e_with_arguments(recorder: tuple[Path, Path]) -> None:
|
|
r = _run_shim(
|
|
recorder,
|
|
["-p", "SIGKILL", "-e", "143", "-v", "-v", "--", "sleep", "infinity"],
|
|
)
|
|
assert r.returncode == 0, r.stderr
|
|
lines = [ln for ln in r.stdout.splitlines() if ln]
|
|
_, wrapper = recorder
|
|
assert lines == [str(wrapper), "sleep", "infinity"]
|
|
assert "SIGKILL" not in lines
|
|
assert "143" not in lines
|