doryani-agent
2a980fbcbd
Salvage the unit-budget implementation from #104745, replacing its test matrix with two invariant tests and covering the sibling graceful start. Keep unprivileged property reads, finite fallbacks, real manager errors, and post-restart health verification. Native disposable user unit: old client timed out after 15.03 seconds; new client completed the same 16-second stop transaction in 16.13 seconds. The unit stayed active with a new PID; missing-unit errors stayed errors. Co-authored-by: Teknium <127238744+teknium1@users.noreply.github.com>
62 lines
2.8 KiB
Python
62 lines
2.8 KiB
Python
"""Update clients cover unit transactions without hiding manager failures."""
|
|
import subprocess
|
|
|
|
import pytest
|
|
|
|
from hermes_cli import update_cmd_fleet as fleet
|
|
|
|
|
|
@pytest.mark.parametrize("graceful,retry", [(False, False), (False, True), (True, False)])
|
|
def test_unit_transaction_budget_preserves_scope_and_health(monkeypatch, graceful, retry):
|
|
scope = ["systemctl", "--no-ask-password"]
|
|
manage = ["sudo", "-n", *scope]
|
|
calls = []
|
|
|
|
def systemctl(cmd, *, timeout):
|
|
calls.append((cmd, timeout))
|
|
if "show" in cmd:
|
|
assert cmd[:len(scope)] == scope
|
|
output = "42" if "--property=MainPID" in cmd else "TimeoutStopUSec=70s\nTimeoutStartUSec=90s"
|
|
return subprocess.CompletedProcess(cmd, 0, output, "")
|
|
if "restart" in cmd or "start" in cmd:
|
|
assert cmd[:len(manage)] == manage
|
|
assert timeout > (90 if graceful else 160)
|
|
return subprocess.CompletedProcess(cmd, 0, "active", "")
|
|
|
|
monkeypatch.setattr(fleet, "_systemctl", systemctl)
|
|
monkeypatch.setattr(fleet, "_drain_or_signal_gateway_for_update", lambda *a: True)
|
|
health = iter([False, True] if retry else [True])
|
|
monkeypatch.setattr(fleet, "_wait_for_service_active", lambda *a, **kw: next(health))
|
|
name = "hermes-gateway-test" if graceful else "hermes-serve-test"
|
|
restarted, failed = [], []
|
|
fleet._restart_one_systemd_gateway_unit(
|
|
name, scope="system", scope_cmd=scope, drain_budget=45,
|
|
_manage_cmd_cache={"system": manage}, restarted_services=restarted,
|
|
failed_or_stale_units=failed,
|
|
)
|
|
assert restarted == [name] and not failed
|
|
assert sum("restart" in cmd or "start" in cmd for cmd, _ in calls) == (2 if retry else 1)
|
|
|
|
|
|
@pytest.mark.parametrize("limits", ["", "TimeoutStopUSec=infinity\nTimeoutStartUSec=invalid", "TimeoutStopUSec=70000000\nTimeoutStartUSec=90s"])
|
|
@pytest.mark.parametrize("outcome", [0, 7, "timeout"])
|
|
def test_budget_fallback_keeps_real_errors(monkeypatch, limits, outcome):
|
|
def systemctl(cmd, *, timeout):
|
|
if "show" in cmd:
|
|
return subprocess.CompletedProcess(cmd, 0, limits, "")
|
|
if "restart" in cmd:
|
|
assert 160 < timeout < 2**31 / 1000
|
|
if outcome == "timeout":
|
|
raise subprocess.TimeoutExpired(cmd, timeout)
|
|
return subprocess.CompletedProcess(cmd, outcome, "", "manager diagnostic")
|
|
return subprocess.CompletedProcess(cmd, 0, "", "")
|
|
|
|
monkeypatch.setattr(fleet, "_systemctl", systemctl)
|
|
if outcome == "timeout":
|
|
with pytest.raises(subprocess.TimeoutExpired):
|
|
fleet._systemctl_reset_and_restart(["systemctl"], "hermes-serve-test")
|
|
else:
|
|
result = fleet._systemctl_reset_and_restart(["systemctl"], "hermes-serve-test")
|
|
assert result.returncode == outcome
|
|
assert result.stderr == "manager diagnostic"
|