mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 04:11:35 +00:00
Follow-up to the salvaged restart-wait commits: - A drain or cron timeout of .inf now means "wait indefinitely" instead of an OverflowError from the integer stop envelope, which crashed `hermes gateway restart` and made `hermes update` silently fall back to its 45s floor. The fleet "draining (up to Ns)" lines and the drain progress report format the budget instead of int()-ing it, so an unbounded wait no longer crashes them either (it did on main too). - cron_drain_timeout is required: a 0.0 default meant "cron opted out", the under-budget this fix exists to remove. - Docstrings describe what the budget actually covers (PID exit, not replacement startup). - Tests assert the observer outlasts after-turn + the supervisor stop envelope and that configured cron reaches the CLI wait, instead of re-deriving the formula; the negative wording assertion on the pending footer is dropped (change-detector).
60 lines
3 KiB
Python
60 lines
3 KiB
Python
"""Unit tests for in-band restart after-turn deferral helpers (#77184)."""
|
|
|
|
import math
|
|
|
|
from gateway.restart import (
|
|
DEFAULT_GATEWAY_RESTART_AFTER_TURN_TIMEOUT,
|
|
parse_restart_after_turn_timeout,
|
|
resolve_restart_exit_wait_budget,
|
|
resolve_systemd_timeout_stop_sec,
|
|
)
|
|
from gateway.run import GatewayRunner
|
|
|
|
|
|
def test_parse_restart_after_turn_timeout_defaults_and_clamps():
|
|
assert parse_restart_after_turn_timeout("") == DEFAULT_GATEWAY_RESTART_AFTER_TURN_TIMEOUT
|
|
assert parse_restart_after_turn_timeout(None) == DEFAULT_GATEWAY_RESTART_AFTER_TURN_TIMEOUT
|
|
assert parse_restart_after_turn_timeout("bogus") == DEFAULT_GATEWAY_RESTART_AFTER_TURN_TIMEOUT
|
|
assert parse_restart_after_turn_timeout(0) == 0.0
|
|
assert parse_restart_after_turn_timeout("-5") == 0.0
|
|
assert parse_restart_after_turn_timeout("120") == 120.0
|
|
|
|
|
|
def test_restart_exit_wait_budget_outlasts_deferral_plus_stop_envelope():
|
|
for chat, after_turn, cron in ((0, 0, 0), (0, 1800, 30), (2, 3, 80), (80, 3, 2), (180, 21600, 0)):
|
|
# The observer must never give up before the supervisor's own stop deadline would.
|
|
assert resolve_restart_exit_wait_budget(chat, after_turn, cron) > after_turn + resolve_systemd_timeout_stop_sec(chat, cron)
|
|
# A non-finite drain waits indefinitely instead of crashing the integer envelope.
|
|
assert resolve_restart_exit_wait_budget(float("inf"), 0, 0) == math.inf
|
|
assert resolve_restart_exit_wait_budget(0, 0, float("inf")) == math.inf
|
|
|
|
|
|
def test_cli_restart_wait_covers_configured_cron_drain(tmp_path, monkeypatch):
|
|
import hermes_cli.gateway as gateway_cli
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
for key in ("HERMES_RESTART_DRAIN_TIMEOUT", "HERMES_RESTART_AFTER_TURN_TIMEOUT", "HERMES_CRON_DRAIN_TIMEOUT"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
config = tmp_path / "config.yaml"
|
|
config.write_text("agent:\n restart_drain_timeout: 2\n restart_after_turn_timeout: 3\n cron_drain_timeout: 80\n")
|
|
with_cron = gateway_cli._get_restart_exit_wait_budget()
|
|
config.write_text("agent:\n restart_drain_timeout: 2\n restart_after_turn_timeout: 3\n cron_drain_timeout: 0\n")
|
|
# The configured cron drain reaches the CLI wait, which outlasts the stop it can take.
|
|
assert with_cron > 3 + resolve_systemd_timeout_stop_sec(2, 80)
|
|
assert with_cron > gateway_cli._get_restart_exit_wait_budget()
|
|
|
|
|
|
def test_load_restart_after_turn_timeout_preserves_zero(tmp_path, monkeypatch):
|
|
"""Config/env ``0`` must disable after-turn wait, not fall back to default."""
|
|
import gateway.run as gateway_run
|
|
|
|
monkeypatch.delenv("HERMES_RESTART_AFTER_TURN_TIMEOUT", raising=False)
|
|
monkeypatch.setattr(gateway_run, "_hermes_home", tmp_path)
|
|
(tmp_path / "config.yaml").write_text(
|
|
"agent:\n restart_after_turn_timeout: 0\n",
|
|
encoding="utf-8",
|
|
)
|
|
assert GatewayRunner._load_restart_after_turn_timeout() == 0.0
|
|
|
|
monkeypatch.setenv("HERMES_RESTART_AFTER_TURN_TIMEOUT", "0")
|
|
assert GatewayRunner._load_restart_after_turn_timeout() == 0.0
|