mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
39975613b1
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
65 lines
2.4 KiB
Python
65 lines
2.4 KiB
Python
"""Runtime smoke test for the Docker tini compatibility shim (#34192, #66679).
|
|
|
|
Build the real image and verify:
|
|
|
|
1. /usr/bin/tini exists as an executable shim (not a bare symlink to
|
|
/init — that forwarded tini's ``-g`` into s6 and boot-looped)
|
|
2. The actual ENTRYPOINT is /init (s6-overlay), not /usr/bin/tini
|
|
3. Legacy ``tini -g -- <cmd>`` entrypoints boot without
|
|
``rc.init: -g: not found``
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
|
|
|
|
def test_tini_compat_shim_exists(built_image: str) -> None:
|
|
"""/usr/bin/tini must be an executable shim script.
|
|
|
|
Regression for #34192 / #66679: orchestration templates (e.g.
|
|
Hostinger's 'Hermes WebUI' catalog, NAS compose projects that keep
|
|
an old entrypoint across image updates) still pin /usr/bin/tini as
|
|
the entrypoint, often with ``-g --``. The shim must exist *and*
|
|
strip those flags before exec'ing /init.
|
|
"""
|
|
r = subprocess.run(
|
|
["docker", "run", "--rm", "--entrypoint", "sh",
|
|
built_image, "-c",
|
|
'test -x /usr/bin/tini && '
|
|
# Must NOT be a raw symlink to /init — that reintroduces #66679.
|
|
'if [ -L /usr/bin/tini ]; then '
|
|
' target="$(readlink -f /usr/bin/tini)"; '
|
|
' test "$target" != "/init"; '
|
|
'fi && '
|
|
'head -n1 /usr/bin/tini | grep -q "^#!"'],
|
|
capture_output=True, text=True, timeout=60,
|
|
)
|
|
assert r.returncode == 0, (
|
|
f"/usr/bin/tini is not a usable tini shim: "
|
|
f"stdout={r.stdout[-500:]!r} stderr={r.stderr[-500:]!r}"
|
|
)
|
|
|
|
|
|
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}"
|
|
)
|
|
|
|
|