Skip to content

test(gateway): derive expected TimeoutStopSec from configured drain timeout #18972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Sanjays2402 wants to merge 1 commit into from
Closed

test(gateway): derive expected TimeoutStopSec from configured drain timeout #18972

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions tests/hermes_cli/test_gateway_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,28 @@ def fake_run(cmd, check=True, **kwargs):


class TestGeneratedSystemdUnits:
@staticmethod
def _expected_timeout_stop_sec() -> int:
"""Mirror the formula in ``hermes_cli.gateway`` so this test stays
green when ``agent.restart_drain_timeout`` (and therefore the
derived TimeoutStopSec headroom) shifts in the shared defaults."""
drain = int(gateway_cli._get_restart_drain_timeout() or 0)
return max(60, drain) + 30

def test_user_unit_avoids_recursive_execstop_and_uses_extended_stop_timeout(self):
unit = gateway_cli.generate_systemd_unit(system=False)

assert "ExecStart=" in unit
assert "ExecStop=" not in unit
assert "ExecReload=/bin/kill -USR1 $MAINPID" in unit
assert f"RestartForceExitStatus={GATEWAY_SERVICE_RESTART_EXIT_CODE}" in unit
# TimeoutStopSec must exceed the default drain_timeout (60s) so
# systemd doesn't SIGKILL the cgroup before post-interrupt cleanup
# (tool subprocess kill, adapter disconnect) runs — issue #8202.
assert "TimeoutStopSec=90" in unit
# TimeoutStopSec must exceed the configured drain_timeout so systemd
# doesn't SIGKILL the cgroup before post-interrupt cleanup (tool
# subprocess kill, adapter disconnect) runs — issue #8202. Compute
# the expected value from the same helper the unit generator uses,
# so the assertion follows the configured default rather than
# hardcoding a stale value.
assert f"TimeoutStopSec={self._expected_timeout_stop_sec()}" in unit

def test_user_unit_includes_resolved_node_directory_in_path(self, monkeypatch):
monkeypatch.setattr(gateway_cli.shutil, "which", lambda cmd: "/home/test/.nvm/versions/node/v24.14.0/bin/node" if cmd == "node" else None)
Expand All @@ -134,10 +145,11 @@ def test_system_unit_avoids_recursive_execstop_and_uses_extended_stop_timeout(se
assert "ExecStop=" not in unit
assert "ExecReload=/bin/kill -USR1 $MAINPID" in unit
assert f"RestartForceExitStatus={GATEWAY_SERVICE_RESTART_EXIT_CODE}" in unit
# TimeoutStopSec must exceed the default drain_timeout (60s) so
# systemd doesn't SIGKILL the cgroup before post-interrupt cleanup
# (tool subprocess kill, adapter disconnect) runs — issue #8202.
assert "TimeoutStopSec=90" in unit
# TimeoutStopSec must exceed the configured drain_timeout so systemd
# doesn't SIGKILL the cgroup before post-interrupt cleanup (tool
# subprocess kill, adapter disconnect) runs — issue #8202. See
# ``_expected_timeout_stop_sec`` above for why this is computed.
assert f"TimeoutStopSec={self._expected_timeout_stop_sec()}" in unit
assert "WantedBy=multi-user.target" in unit


Expand Down
Loading