mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-30 19:09:28 +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.
158 lines
4.8 KiB
Python
158 lines
4.8 KiB
Python
"""Tests for systemd optional-directive normalization (issue #41119).
|
|
|
|
On older systemd versions that don't support RestartMaxDelaySec /
|
|
RestartSteps, the installed unit file has those directives silently
|
|
dropped. Without normalization, systemd_unit_is_current() would
|
|
perpetually report the unit as outdated because the strict text
|
|
comparison sees a difference.
|
|
|
|
The fix: _strip_optional_systemd_directives() removes those directives
|
|
from both the installed and expected text before comparison.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _strip_optional_systemd_directives
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestStripOptionalSystemdDirectives:
|
|
def test_removes_restart_max_delay_sec(self):
|
|
from hermes_cli.gateway import _strip_optional_systemd_directives
|
|
text = """[Service]
|
|
Restart=always
|
|
RestartSec=5
|
|
RestartMaxDelaySec=300
|
|
RestartSteps=5
|
|
"""
|
|
result = _strip_optional_systemd_directives(text)
|
|
assert "RestartMaxDelaySec" not in result
|
|
assert "RestartSteps" not in result
|
|
assert "Restart=always" in result
|
|
assert "RestartSec=5" in result
|
|
|
|
|
|
|
|
|
|
|
|
def test_full_unit_comparison(self):
|
|
"""Simulate the full stale-check flow with an older systemd unit."""
|
|
from hermes_cli.gateway import (
|
|
_normalize_service_definition,
|
|
_strip_optional_systemd_directives,
|
|
)
|
|
# What the installed unit looks like on older systemd (directives stripped)
|
|
installed = """[Unit]
|
|
Description=Hermes Gateway
|
|
After=network-online.target
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStart=/usr/bin/python -m hermes_cli.main gateway run
|
|
Restart=always
|
|
RestartSec=5
|
|
KillMode=mixed
|
|
KillSignal=SIGTERM
|
|
|
|
[Install]
|
|
WantedBy=default.target
|
|
"""
|
|
# What generate_systemd_unit produces (with the directives)
|
|
expected = """[Unit]
|
|
Description=Hermes Gateway
|
|
After=network-online.target
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStart=/usr/bin/python -m hermes_cli.main gateway run
|
|
Restart=always
|
|
RestartSec=5
|
|
RestartMaxDelaySec=300
|
|
RestartSteps=5
|
|
KillMode=mixed
|
|
KillSignal=SIGTERM
|
|
|
|
[Install]
|
|
WantedBy=default.target
|
|
"""
|
|
# Without normalization, they differ
|
|
assert _normalize_service_definition(installed) != _normalize_service_definition(expected)
|
|
|
|
# With optional-directive stripping, they match
|
|
norm_installed = _normalize_service_definition(
|
|
_strip_optional_systemd_directives(installed)
|
|
)
|
|
norm_expected = _normalize_service_definition(
|
|
_strip_optional_systemd_directives(expected)
|
|
)
|
|
assert norm_installed == norm_expected
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# systemd_unit_is_current integration
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestSystemdUnitIsCurrent:
|
|
def test_unit_without_fatal_config_restart_policy_is_not_current(
|
|
self, tmp_path, monkeypatch,
|
|
):
|
|
from hermes_cli import gateway as gw
|
|
|
|
expected = """[Service]
|
|
Restart=always
|
|
RestartForceExitStatus=75
|
|
RestartPreventExitStatus=78
|
|
"""
|
|
installed = expected.replace("RestartPreventExitStatus=78\n", "")
|
|
unit_file = tmp_path / "hermes-gateway.service"
|
|
unit_file.write_text(installed)
|
|
|
|
monkeypatch.setattr(gw, "get_systemd_unit_path", lambda system=False: unit_file)
|
|
monkeypatch.setattr(
|
|
gw,
|
|
"generate_systemd_unit",
|
|
lambda system=False, run_as_user=None: expected,
|
|
)
|
|
|
|
assert gw.systemd_unit_is_current(system=False) is False
|
|
|
|
def test_unit_without_optional_directives_is_current(self, tmp_path, monkeypatch):
|
|
"""Installed unit missing RestartMaxDelaySec/RestartSteps should be
|
|
considered current when the generated unit includes them."""
|
|
from hermes_cli import gateway as gw
|
|
|
|
installed = """[Unit]
|
|
Description=Hermes Gateway
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStart=/usr/bin/python gateway run
|
|
Restart=always
|
|
RestartSec=5
|
|
|
|
[Install]
|
|
WantedBy=default.target
|
|
"""
|
|
unit_file = tmp_path / "hermes-gateway.service"
|
|
unit_file.write_text(installed)
|
|
|
|
monkeypatch.setattr(gw, "get_systemd_unit_path", lambda system=False: unit_file)
|
|
monkeypatch.setattr(
|
|
gw,
|
|
"generate_systemd_unit",
|
|
lambda system=False, run_as_user=None: installed + "\nRestartMaxDelaySec=300\nRestartSteps=5\n",
|
|
)
|
|
|
|
assert gw.systemd_unit_is_current(system=False) is True
|
|
|
|
|
|
def test_nonexistent_unit_is_not_current(self, tmp_path, monkeypatch):
|
|
from hermes_cli import gateway as gw
|
|
unit_file = tmp_path / "nonexistent.service"
|
|
monkeypatch.setattr(gw, "get_systemd_unit_path", lambda system=False: unit_file)
|
|
assert gw.systemd_unit_is_current(system=False) is False
|