mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-10 03:22:05 +00:00
fix(gateway): cap adapter disconnect during stop
This commit is contained in:
parent
524cbabd89
commit
dccf1fb6e0
4 changed files with 79 additions and 2 deletions
|
|
@ -10,6 +10,8 @@ The fix: gateway/run.py wraps each adapter connect() with a safety-net
|
|||
call to _safe_adapter_disconnect() in the failure branches.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
from unittest.mock import AsyncMock, MagicMock
|
||||
|
||||
import pytest
|
||||
|
|
@ -57,3 +59,21 @@ async def test_safe_disconnect_handles_none_platform(bare_runner):
|
|||
await bare_runner._safe_adapter_disconnect(adapter, None)
|
||||
|
||||
adapter.disconnect.assert_awaited_once()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_safe_disconnect_times_out_and_continues(bare_runner, monkeypatch, caplog):
|
||||
"""A wedged adapter disconnect must not block gateway shutdown."""
|
||||
monkeypatch.setenv("HERMES_GATEWAY_ADAPTER_DISCONNECT_TIMEOUT", "0.001")
|
||||
adapter = MagicMock()
|
||||
|
||||
async def hang():
|
||||
await asyncio.sleep(60)
|
||||
|
||||
adapter.disconnect = AsyncMock(side_effect=hang)
|
||||
|
||||
with caplog.at_level(logging.WARNING, logger="gateway.run"):
|
||||
await bare_runner._safe_adapter_disconnect(adapter, Platform.FEISHU)
|
||||
|
||||
adapter.disconnect.assert_awaited_once()
|
||||
assert "Timed out after 0.0s while disconnecting feishu adapter" in caplog.text
|
||||
|
|
|
|||
|
|
@ -140,6 +140,29 @@ class TestSystemdServiceRefresh:
|
|||
assert markers == [321]
|
||||
assert calls == [["stop", gateway_cli.get_service_name()]]
|
||||
|
||||
def test_systemd_stop_timeout_prints_status_guidance(self, monkeypatch, capsys):
|
||||
markers = []
|
||||
|
||||
monkeypatch.setattr(gateway_cli, "_select_systemd_scope", lambda system=False: False)
|
||||
monkeypatch.setattr(gateway_cli, "_require_service_installed", lambda action, system=False: None)
|
||||
monkeypatch.setattr(status, "get_running_pid", lambda cleanup_stale=True: 321)
|
||||
monkeypatch.setattr(
|
||||
status,
|
||||
"write_planned_stop_marker",
|
||||
lambda pid: markers.append(pid) or True,
|
||||
)
|
||||
|
||||
def fake_run_systemctl(args, **kwargs):
|
||||
raise subprocess.TimeoutExpired(args, kwargs.get("timeout"))
|
||||
|
||||
monkeypatch.setattr(gateway_cli, "_run_systemctl", fake_run_systemctl)
|
||||
|
||||
gateway_cli.systemd_stop()
|
||||
|
||||
assert markers == [321]
|
||||
output = capsys.readouterr().out
|
||||
assert "still stopping after 90s" in output
|
||||
assert "hermes gateway status" in output
|
||||
|
||||
def test_run_gateway_refreshes_outdated_unit_on_boot(self, tmp_path, monkeypatch):
|
||||
"""run_gateway() should refresh the systemd unit on boot so that
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue