mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +00:00
a4092ab217
Follow-up to @benbarclay's Docker s6 PR (#30136). The Phase 4 hooks `_maybe_register_gateway_service` and `_maybe_unregister_gateway_service` were already documented as "no-op on host", but they reached that no-op by: 1. importing `hermes_cli.service_manager` 2. calling `get_service_manager()` (which calls `detect_service_manager()`) 3. checking `mgr.supports_runtime_registration()` and returning False If anything in step 1 or 2 raised an unexpected exception (e.g. a host machine with a partial s6 install — `/proc/1/comm == s6-svscan` somehow, but `/run/s6/basedir` absent, or vice versa), the `except Exception` in the hook would print a confusing "⚠ Could not register s6 gateway service: ..." warning on a non-container machine that has never touched the container. Reorder so `detect_service_manager() != "s6"` is checked FIRST, and return silently for any detection failure. Host machines now: - never import the s6 backend - never call get_service_manager() - never print an s6-shaped warning under any failure mode E2E confirmed on host Linux (systemd): `_maybe_register_gateway_service(...)` produces empty stdout, detect_service_manager() returns "systemd". Existing tests updated to patch `detect_service_manager` for the s6 call-through cases (they previously relied on get_service_manager being the only gate, which is no longer true). Added one new test — `test_register_silent_when_detect_throws` — asserting that a broken detector cannot leak a warning to host users. cc @benbarclay — visible behavior change vs. your branch is one fewer code path on host. Test changes are minimal (one helper + `_patch_detect_s6` opt-in per s6 test). Happy to revert if you prefer the original shape.
210 lines
7.4 KiB
Python
210 lines
7.4 KiB
Python
"""Tests for the Phase 4 s6 hooks in hermes_cli.profiles.
|
|
|
|
Specifically: _maybe_register_gateway_service,
|
|
_maybe_unregister_gateway_service. The integration with
|
|
create_profile and delete_profile is covered indirectly by the
|
|
existing TestCreateProfile and TestDeleteProfile classes in
|
|
tests/hermes_cli/test_profiles.py; here we only exercise the new
|
|
helper surface that doesn't touch the filesystem.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
import pytest
|
|
|
|
from hermes_cli.profiles import (
|
|
_maybe_register_gateway_service,
|
|
_maybe_unregister_gateway_service,
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _maybe_register_gateway_service / _maybe_unregister_gateway_service
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class _HostManager:
|
|
"""Mimics a host backend that doesn't support runtime registration."""
|
|
kind = "systemd"
|
|
|
|
def supports_runtime_registration(self) -> bool:
|
|
return False
|
|
|
|
def register_profile_gateway(self, *args: Any, **kwargs: Any) -> None:
|
|
raise AssertionError("host backend register_profile_gateway should not be called")
|
|
|
|
def unregister_profile_gateway(self, *args: Any, **kwargs: Any) -> None:
|
|
raise AssertionError("host backend unregister_profile_gateway should not be called")
|
|
|
|
|
|
class _S6Manager:
|
|
"""Mimics S6ServiceManager just enough for the hooks."""
|
|
kind = "s6"
|
|
|
|
def __init__(self) -> None:
|
|
self.registered: list[str] = []
|
|
self.unregistered: list[str] = []
|
|
self.raise_on_register: Exception | None = None
|
|
self.raise_on_unregister: Exception | None = None
|
|
|
|
def supports_runtime_registration(self) -> bool:
|
|
return True
|
|
|
|
def register_profile_gateway(
|
|
self, profile: str, *,
|
|
extra_env: dict[str, str] | None = None,
|
|
) -> None:
|
|
if self.raise_on_register is not None:
|
|
raise self.raise_on_register
|
|
self.registered.append(profile)
|
|
|
|
def unregister_profile_gateway(self, profile: str) -> None:
|
|
if self.raise_on_unregister is not None:
|
|
raise self.raise_on_unregister
|
|
self.unregistered.append(profile)
|
|
|
|
|
|
def _patch_detect_s6(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
"""Pretend we're inside an s6 container so the host short-circuit
|
|
in :func:`_maybe_register_gateway_service` /
|
|
:func:`_maybe_unregister_gateway_service` doesn't fire.
|
|
|
|
Without this, ``detect_service_manager()`` runs its real
|
|
implementation (host Linux/macOS in CI), returns ``"systemd"`` or
|
|
``"launchd"``, and the hooks return early before reaching the
|
|
patched ``get_service_manager``. Each s6-call-through test
|
|
explicitly opts into this so the host-no-op tests can still
|
|
exercise the early-return path.
|
|
"""
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.detect_service_manager",
|
|
lambda: "s6",
|
|
)
|
|
|
|
|
|
def test_register_noop_on_host(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
# NOTE: deliberately DO NOT patch detect_service_manager — we want
|
|
# the real host detection to kick in and short-circuit before
|
|
# get_service_manager is ever called. The lambda below is a
|
|
# defense-in-depth assertion that get_service_manager is never
|
|
# reached on host.
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager",
|
|
lambda: _HostManager(),
|
|
)
|
|
# Should NOT raise the AssertionError from _HostManager.register
|
|
_maybe_register_gateway_service("hostprof")
|
|
|
|
|
|
def test_register_calls_through_on_s6(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
_patch_detect_s6(monkeypatch)
|
|
mgr = _S6Manager()
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager", lambda: mgr,
|
|
)
|
|
_maybe_register_gateway_service("coder")
|
|
assert mgr.registered == ["coder"]
|
|
|
|
|
|
def test_register_swallows_duplicate_value_error(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
"""A pre-existing s6 registration (from container-boot reconcile)
|
|
is a benign condition — register must not propagate ValueError."""
|
|
_patch_detect_s6(monkeypatch)
|
|
mgr = _S6Manager()
|
|
mgr.raise_on_register = ValueError("already registered")
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager", lambda: mgr,
|
|
)
|
|
# Should NOT raise
|
|
_maybe_register_gateway_service("coder")
|
|
|
|
|
|
def test_register_swallows_arbitrary_error(
|
|
monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str],
|
|
) -> None:
|
|
"""Even an unexpected exception from the manager must not bring
|
|
down `hermes profile create` — print and continue."""
|
|
_patch_detect_s6(monkeypatch)
|
|
mgr = _S6Manager()
|
|
mgr.raise_on_register = RuntimeError("svscanctl exploded")
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager", lambda: mgr,
|
|
)
|
|
_maybe_register_gateway_service("coder")
|
|
captured = capsys.readouterr()
|
|
assert "Could not register" in captured.out
|
|
|
|
|
|
def test_register_swallows_no_backend_runtime_error(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
"""When `get_service_manager()` raises RuntimeError (no backend
|
|
detected), the hook must silently no-op."""
|
|
_patch_detect_s6(monkeypatch)
|
|
def _no_backend() -> None:
|
|
raise RuntimeError("no supported service manager detected")
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager", _no_backend,
|
|
)
|
|
# Should NOT raise
|
|
_maybe_register_gateway_service("anywhere")
|
|
|
|
|
|
def test_register_silent_when_detect_throws(
|
|
monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str],
|
|
) -> None:
|
|
"""If detect_service_manager itself raises (e.g. a partial s6
|
|
install on a host machine), the hook must stay silent — no
|
|
confusing s6 warning printed to a user who has never touched a
|
|
container."""
|
|
def _broken_detect() -> str:
|
|
raise RuntimeError("detection blew up")
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.detect_service_manager", _broken_detect,
|
|
)
|
|
# If get_service_manager is reached, the test will assert via
|
|
# _HostManager.register. It must NOT be reached.
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager",
|
|
lambda: _HostManager(),
|
|
)
|
|
_maybe_register_gateway_service("anywhere")
|
|
captured = capsys.readouterr()
|
|
assert "Could not register" not in captured.out
|
|
assert captured.out == ""
|
|
|
|
|
|
def test_unregister_noop_on_host(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
# Same as test_register_noop_on_host: rely on real host detection.
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager",
|
|
lambda: _HostManager(),
|
|
)
|
|
_maybe_unregister_gateway_service("hostprof")
|
|
|
|
|
|
def test_unregister_calls_through_on_s6(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
_patch_detect_s6(monkeypatch)
|
|
mgr = _S6Manager()
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager", lambda: mgr,
|
|
)
|
|
_maybe_unregister_gateway_service("coder")
|
|
assert mgr.unregistered == ["coder"]
|
|
|
|
|
|
def test_unregister_swallows_errors(
|
|
monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str],
|
|
) -> None:
|
|
_patch_detect_s6(monkeypatch)
|
|
mgr = _S6Manager()
|
|
mgr.raise_on_unregister = RuntimeError("svc gone weird")
|
|
monkeypatch.setattr(
|
|
"hermes_cli.service_manager.get_service_manager", lambda: mgr,
|
|
)
|
|
_maybe_unregister_gateway_service("coder")
|
|
captured = capsys.readouterr()
|
|
assert "Could not unregister" in captured.out
|