mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-01 07:01:41 +00:00
PR #30136 review caught: `_allocate_gateway_port()` in profiles.py computed a SHA-256-derived port that was threaded through `register_profile_gateway(profile, port=N)` → `_render_run_script(profile, port, extra_env)` → and then **ignored**. The rendered run script picked the bind port from the profile's config.yaml (`[gateway] port = …`), never from the allocator. So the entire allocator + parameter chain was dead code. Remove: * `hermes_cli.profiles._allocate_gateway_port` (deterministic SHA-256 → [9200, 9800) — never used). * `port` kwarg from `ServiceManager.register_profile_gateway` (Protocol + Mixin + S6 implementation). * `port` positional arg from `_render_run_script(profile, port, extra_env)` — now `_render_run_script(profile, extra_env)`. * The pass-through call in `profiles._maybe_register_gateway_service`. config.yaml is now the single source of truth for gateway port selection — matches reality and reduces the API surface. Three explanatory comments in service_manager.py / profiles.py document the retirement so future readers don't reach for the allocator and find a ghost. Tests: drop the three `_allocate_gateway_port` tests; update fakes' signatures throughout test_service_manager.py and test_profiles_s6_hooks.py to match the new no-port API.
156 lines
5.2 KiB
Python
156 lines
5.2 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 test_register_noop_on_host(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
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:
|
|
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."""
|
|
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."""
|
|
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."""
|
|
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_unregister_noop_on_host(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
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:
|
|
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:
|
|
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
|