mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-10-20 05:15:31 +00:00
3e89edf830
Add a module-scoped `shared_container` fixture to tests/docker/conftest.py that boots one `sleep infinity` container per test module and tears it down at module exit. Convert read-only tests that previously used `docker run --rm --entrypoint sh/cat/test/su` (bypassing s6 to check static image properties) or `docker run -d` + `docker exec` (starting identical containers per test) to use `docker exec` on the shared container instead. Converted files: test_immutable_install_permissions.py — 2 throwaway runs → 2 execs test_license_file_present.py — 1 throwaway run → 1 exec test_tini_compat_shim.py — 1 throwaway run → 1 exec test_tui_prebuilt_bundle.py — 2 throwaway runs → 2 execs test_dump_build_sha.py — 2 throwaway runs → 2 execs test_immutable_install.py — 3 detached runs → 1 shared + 1 isolated test_dashboard.py — 2 detached runs → 0 (use shared) Local profiling shows docker run calls in these 7 files dropped from ~25 to 7 (the 7 are shared_container boots per module + the one test that needs a restart). Each eliminated `docker run` was paying 1-9s of s6 cont-init startup; the replacement `docker exec` calls average 0.10s — an ~50x speedup per operation. Tests that mutate state (restarts, config changes, gateway starts) still use their own containers via `container_name` + `start_container`.
53 lines
2 KiB
Python
53 lines
2 KiB
Python
"""Runtime smoke test for the Docker tini compatibility shim (#34192).
|
|
|
|
Build the real image and verify:
|
|
|
|
1. /usr/bin/tini exists and is a symlink to /init (the compat shim
|
|
for orchestration templates that still reference /usr/bin/tini)
|
|
2. The actual ENTRYPOINT is /init (s6-overlay), not /usr/bin/tini
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
|
|
|
|
def test_tini_compat_symlink_exists(shared_container: str) -> None:
|
|
"""/usr/bin/tini must exist as a symlink to /init.
|
|
|
|
Regression for #34192: orchestration templates (e.g. Hostinger's
|
|
'Hermes WebUI' catalog) still pin /usr/bin/tini as the entrypoint.
|
|
The shim symlinks it to /init so legacy wrappers exec the right
|
|
PID-1 reaper without behavior change.
|
|
"""
|
|
r = subprocess.run(
|
|
["docker", "exec", shared_container, "sh", "-c",
|
|
'test -L /usr/bin/tini && '
|
|
'test "$(readlink -f /usr/bin/tini)" = "/init"'],
|
|
capture_output=True, text=True, timeout=30,
|
|
)
|
|
assert r.returncode == 0, (
|
|
f"/usr/bin/tini is not a symlink to /init: {r.stderr[-500:]}"
|
|
)
|
|
|
|
|
|
def test_entrypoint_is_init_not_tini(built_image: str) -> None:
|
|
"""The image's actual ENTRYPOINT must be /init (s6-overlay).
|
|
|
|
The tini shim is only for legacy external wrappers; the image's own
|
|
runtime must continue to use the canonical /init.
|
|
"""
|
|
r = subprocess.run(
|
|
["docker", "inspect", built_image,
|
|
"--format", "{{json .Config.Entrypoint}}"],
|
|
capture_output=True, text=True, timeout=30,
|
|
)
|
|
assert r.returncode == 0, f"docker inspect failed: {r.stderr}"
|
|
entrypoint = r.stdout.strip()
|
|
assert "/init" in entrypoint, (
|
|
f"ENTRYPOINT is not /init: {entrypoint!r}"
|
|
)
|
|
# The entrypoint array should be ["/init", "/opt/hermes/docker/main-wrapper.sh"]
|
|
# /usr/bin/tini should NOT be in the entrypoint.
|
|
assert "tini" not in entrypoint.lower(), (
|
|
f"ENTRYPOINT references tini instead of /init: {entrypoint!r}"
|
|
)
|