mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-24 16:54:43 +00:00
Replace REST-based Discord liveness probe with local WebSocket/heartbeat state detection. REST success doesn't prove Gateway event delivery — a half-closed WebSocket can leave Bot.start() alive while REST returns 200. Now samples ready/open/ACK state and heartbeat latency; consecutive unhealthy samples emit one retryable fatal code so GatewayRunner rebuilds the adapter through the existing reconnect path. Also fixes three lifecycle gaps in the recovery path: 1. asyncio.wait_for() can remain blocked if adapter cleanup swallows cancellation — now uses bounded asyncio.wait() with task detachment. 2. Multiplexed secondary-profile adapters had no profile-scoped reconnect owner — now uses one runner-owned reconnect slot per profile. 3. An in-flight turn could send its final text through the disconnected adapter after a replacement was registered — now resolves the live same-profile replacement for unsent final responses only (message IDs never migrate, edits/deletes stay on the old transport). Adds an opt-in Linux/systemd event-loop watchdog (gateway.systemd_watchdog_seconds, default 0) for the failure mode where the whole asyncio loop stops making progress and no in-process liveness task can run. stdlib-only sd_notify, Type=notify/WatchdogSec generation, READY/STOPPING lifecycle. Co-authored-by: 王鑫 <wx.xw@bytedance.com>
572 lines
20 KiB
Python
572 lines
20 KiB
Python
"""Regression tests for Discord Gateway WebSocket liveness.
|
|
|
|
A Discord REST response and the Gateway WebSocket are independent transports.
|
|
A half-closed Gateway socket can leave ``Bot.start()`` alive while REST still
|
|
returns 200, so health must come from the active WebSocket's ready/open/ACK and
|
|
heartbeat-latency state rather than ``fetch_user()``.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import time
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, Mock
|
|
|
|
import pytest
|
|
|
|
# Re-use the shared discord-stub bootstrap and FakeBot from the connect
|
|
# test module so this file doesn't duplicate the (large) mock surface.
|
|
from tests.gateway.test_discord_connect import ( # noqa: E402
|
|
FakeBot,
|
|
_ensure_discord_mock,
|
|
)
|
|
|
|
_ensure_discord_mock()
|
|
|
|
import plugins.platforms.discord.adapter as discord_platform # noqa: E402
|
|
from gateway.config import Platform, PlatformConfig # noqa: E402
|
|
from gateway.run import GatewayRunner # noqa: E402
|
|
from plugins.platforms.discord.adapter import DiscordAdapter # noqa: E402
|
|
|
|
|
|
class _LiveBot(FakeBot):
|
|
"""A FakeBot whose ``start()`` stays pending like a real discord.py client.
|
|
|
|
The default ``FakeBot.start()`` returns immediately, which would let the
|
|
bot-task done callback fire and set a spurious fatal error. Real clients
|
|
keep ``start()`` running for the life of the connection; this models that
|
|
so the liveness probe is the only thing that can trip a fatal error.
|
|
"""
|
|
|
|
def __init__(self, *, intents, proxy=None, allowed_mentions=None, **_):
|
|
super().__init__(intents=intents, allowed_mentions=allowed_mentions)
|
|
self._never = asyncio.Event()
|
|
self._closed = False
|
|
self._gateway_ready = True
|
|
self.latency = 0.05
|
|
self.ws = _FakeWebSocket()
|
|
|
|
def is_ready(self):
|
|
return self._gateway_ready
|
|
|
|
async def start(self, token):
|
|
if "on_ready" in self._events:
|
|
await self._events["on_ready"]()
|
|
# Stay alive until close() is called — mirrors a real client.
|
|
await self._never.wait()
|
|
|
|
def is_closed(self):
|
|
return self._closed
|
|
|
|
async def close(self):
|
|
self._closed = True
|
|
self._never.set()
|
|
|
|
|
|
class _FakeKeepAlive:
|
|
def __init__(self, *, ack_age: float = 0.0):
|
|
self._last_ack = time.perf_counter() - ack_age
|
|
|
|
|
|
class _FakeWebSocket:
|
|
def __init__(self, *, open: bool = True, ack_age: float = 0.0):
|
|
self.open = open
|
|
self._keep_alive = _FakeKeepAlive(ack_age=ack_age)
|
|
|
|
|
|
def _set_websocket_health(
|
|
bot: _LiveBot,
|
|
*,
|
|
ready: bool = True,
|
|
socket_open: bool = True,
|
|
latency: float = 0.05,
|
|
ack_age: float = 0.0,
|
|
) -> None:
|
|
bot._gateway_ready = ready
|
|
bot.latency = latency
|
|
bot.ws = _FakeWebSocket(open=socket_open, ack_age=ack_age)
|
|
|
|
|
|
def _make_adapter(
|
|
monkeypatch,
|
|
*,
|
|
interval=0.01,
|
|
threshold=1,
|
|
max_ack_age=1.0,
|
|
max_latency=1.0,
|
|
) -> DiscordAdapter:
|
|
monkeypatch.setenv("HERMES_DISCORD_LIVENESS_INTERVAL_SECONDS", str(interval))
|
|
monkeypatch.setenv("HERMES_DISCORD_LIVENESS_FAILURE_THRESHOLD", str(threshold))
|
|
return DiscordAdapter(
|
|
PlatformConfig(
|
|
enabled=True,
|
|
token="test-token",
|
|
extra={
|
|
"websocket_heartbeat_ack_max_age_seconds": max_ack_age,
|
|
"websocket_max_latency_seconds": max_latency,
|
|
},
|
|
)
|
|
)
|
|
|
|
|
|
class _BrokenWebSocket:
|
|
@property
|
|
def open(self):
|
|
raise RuntimeError("socket state unavailable")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("key", "attribute", "raw"),
|
|
[
|
|
("websocket_liveness_interval_seconds", "_liveness_interval_seconds", "nan"),
|
|
("websocket_heartbeat_ack_max_age_seconds", "_heartbeat_ack_max_age_seconds", "inf"),
|
|
("websocket_max_latency_seconds", "_max_latency_seconds", "-inf"),
|
|
],
|
|
)
|
|
def test_nonfinite_liveness_config_disables_that_probe_dimension(monkeypatch, key, attribute, raw):
|
|
adapter = DiscordAdapter(
|
|
PlatformConfig(enabled=True, token="test-token", extra={key: raw})
|
|
)
|
|
|
|
assert getattr(adapter, attribute) == 0.0
|
|
|
|
|
|
def test_default_liveness_bounds_trigger_timed_recovery(monkeypatch):
|
|
for key in (
|
|
"HERMES_DISCORD_LIVENESS_INTERVAL_SECONDS",
|
|
"HERMES_DISCORD_LIVENESS_FAILURE_THRESHOLD",
|
|
):
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
adapter = DiscordAdapter(PlatformConfig(enabled=True, token="test-token"))
|
|
|
|
assert adapter._liveness_interval_seconds == 15.0
|
|
assert adapter._liveness_failure_threshold == 2
|
|
assert adapter._heartbeat_ack_max_age_seconds == 60.0
|
|
assert adapter._max_latency_seconds == 30.0
|
|
|
|
|
|
def test_platform_config_extra_overrides_process_liveness_bridge(monkeypatch):
|
|
monkeypatch.setenv("HERMES_DISCORD_LIVENESS_INTERVAL_SECONDS", "99")
|
|
monkeypatch.setenv("HERMES_DISCORD_LIVENESS_FAILURE_THRESHOLD", "9")
|
|
|
|
adapter = DiscordAdapter(
|
|
PlatformConfig(
|
|
enabled=True,
|
|
token="test-token",
|
|
extra={
|
|
"websocket_liveness_interval_seconds": 7,
|
|
"websocket_liveness_failure_threshold": 2,
|
|
"websocket_heartbeat_ack_max_age_seconds": 45,
|
|
"websocket_max_latency_seconds": 12,
|
|
},
|
|
)
|
|
)
|
|
|
|
assert adapter._liveness_interval_seconds == 7
|
|
assert adapter._liveness_failure_threshold == 2
|
|
assert adapter._heartbeat_ack_max_age_seconds == 45
|
|
assert adapter._max_latency_seconds == 12
|
|
|
|
|
|
async def _connect(adapter: DiscordAdapter, monkeypatch, bot_factory):
|
|
monkeypatch.setattr(
|
|
"gateway.status.acquire_scoped_lock",
|
|
lambda scope, identity, metadata=None: (True, None),
|
|
)
|
|
monkeypatch.setattr("gateway.status.release_scoped_lock", lambda scope, identity: None)
|
|
intents = SimpleNamespace(
|
|
message_content=False, dm_messages=False, guild_messages=False,
|
|
members=False, voice_states=False,
|
|
)
|
|
monkeypatch.setattr(discord_platform.Intents, "default", lambda: intents)
|
|
monkeypatch.setattr(discord_platform.commands, "Bot", bot_factory)
|
|
monkeypatch.setattr(adapter, "_resolve_allowed_usernames", AsyncMock())
|
|
assert await adapter.connect() is True
|
|
|
|
|
|
async def _wait_until(predicate, message: str, timeout: float = 2.0) -> None:
|
|
deadline = asyncio.get_running_loop().time() + timeout
|
|
while not predicate():
|
|
if asyncio.get_running_loop().time() >= deadline:
|
|
pytest.fail(message)
|
|
await asyncio.sleep(0.01)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_probe_disabled_when_interval_zero(monkeypatch):
|
|
"""interval<=0 must skip the probe entirely so users can opt out."""
|
|
adapter = _make_adapter(monkeypatch, interval=0)
|
|
|
|
bot_holder: dict = {}
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
bot.fetch_user = AsyncMock()
|
|
bot_holder["bot"] = bot
|
|
return bot
|
|
|
|
await _connect(adapter, monkeypatch, factory)
|
|
assert adapter._liveness_task is None
|
|
await asyncio.sleep(0.05)
|
|
bot_holder["bot"].fetch_user.assert_not_called()
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_probe_disabled_when_threshold_zero(monkeypatch):
|
|
"""threshold<=0 must also skip the probe."""
|
|
adapter = _make_adapter(monkeypatch, interval=0.01, threshold=0)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
bot.fetch_user = AsyncMock()
|
|
return bot
|
|
|
|
await _connect(adapter, monkeypatch, factory)
|
|
assert adapter._liveness_task is None
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_probe_does_not_call_rest_while_websocket_is_healthy(monkeypatch):
|
|
"""A fresh Gateway ACK is sufficient; REST is not a transport health probe."""
|
|
adapter = _make_adapter(monkeypatch, interval=0.01, threshold=3)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
_set_websocket_health(bot)
|
|
bot.fetch_user = AsyncMock(return_value=SimpleNamespace(id=999))
|
|
return bot
|
|
|
|
await _connect(adapter, monkeypatch, factory)
|
|
await asyncio.sleep(0.05)
|
|
adapter._client.fetch_user.assert_not_awaited()
|
|
assert adapter._running is True
|
|
assert adapter.has_fatal_error is False
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_probe_forces_reconnect_when_rest_succeeds_but_gateway_ack_is_stale(monkeypatch):
|
|
"""A REST response must not hide a stale Gateway heartbeat failure."""
|
|
adapter = _make_adapter(monkeypatch, interval=0.005, threshold=2, max_ack_age=0.01)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
_set_websocket_health(bot, ack_age=3600)
|
|
bot.fetch_user = AsyncMock(return_value=SimpleNamespace(id=999))
|
|
return bot
|
|
|
|
handler = AsyncMock()
|
|
adapter.set_fatal_error_handler(handler)
|
|
await _connect(adapter, monkeypatch, factory)
|
|
wedged = adapter._client
|
|
|
|
# The sampler schedules the close + supervisor callback in a sibling task
|
|
# so the fatal path cannot cancel/await itself through disconnect().
|
|
await _wait_until(
|
|
lambda: handler.await_count,
|
|
"liveness recovery notification did not complete within 2s",
|
|
)
|
|
|
|
assert adapter._liveness_task and adapter._liveness_task.done()
|
|
assert wedged.is_closed() is True
|
|
assert adapter.has_fatal_error is True
|
|
assert adapter.fatal_error_code == "discord_websocket_health_stale"
|
|
assert adapter.fatal_error_retryable is True
|
|
wedged.fetch_user.assert_not_awaited()
|
|
handler.assert_awaited_once()
|
|
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_fatal_queues_primary_runner_reconnect_without_self_cancellation(monkeypatch):
|
|
adapter = _make_adapter(monkeypatch, interval=0.005, threshold=1, max_ack_age=0.01)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
_set_websocket_health(bot, ack_age=3600)
|
|
return bot
|
|
|
|
runner = GatewayRunner.__new__(GatewayRunner)
|
|
runner.adapters = {Platform.DISCORD: adapter}
|
|
runner._failed_platforms = {}
|
|
runner._running = True
|
|
runner.stop = AsyncMock()
|
|
runner.delivery_router = SimpleNamespace(adapters=runner.adapters)
|
|
runner.config = SimpleNamespace(platforms={Platform.DISCORD: adapter.config})
|
|
runner._update_platform_runtime_status = lambda *args, **kwargs: None
|
|
runner._adapter_disconnect_timeout_secs = lambda: 0.1
|
|
adapter.set_fatal_error_handler(runner._handle_adapter_fatal_error)
|
|
await _connect(adapter, monkeypatch, factory)
|
|
|
|
await _wait_until(
|
|
lambda: Platform.DISCORD in runner._failed_platforms,
|
|
"liveness fatal did not reach the runner reconnect queue",
|
|
)
|
|
|
|
assert adapter._liveness_notification_task is None or adapter._liveness_notification_task.done()
|
|
assert runner._failed_platforms[Platform.DISCORD]["attempts"] == 0
|
|
runner.stop.assert_not_awaited()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize(
|
|
("health", "expected_reason"),
|
|
[
|
|
({"ready": False}, "not_ready"),
|
|
({"socket_open": False}, "socket_closed"),
|
|
({"latency": float("inf")}, "latency_non_finite"),
|
|
],
|
|
)
|
|
async def test_liveness_probe_reports_gateway_health_failure_reason(monkeypatch, health, expected_reason):
|
|
adapter = _make_adapter(monkeypatch, interval=0.005, threshold=1)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
_set_websocket_health(bot, **health)
|
|
bot.fetch_user = AsyncMock(return_value=SimpleNamespace(id=999))
|
|
return bot
|
|
|
|
handler = AsyncMock()
|
|
adapter.set_fatal_error_handler(handler)
|
|
await _connect(adapter, monkeypatch, factory)
|
|
|
|
await _wait_until(
|
|
lambda: handler.await_count,
|
|
"liveness loop did not surface a websocket health failure",
|
|
)
|
|
|
|
assert expected_reason in (adapter.fatal_error_message or "")
|
|
adapter._client.fetch_user.assert_not_awaited()
|
|
handler.assert_awaited_once()
|
|
await adapter.disconnect()
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_probe_treats_websocket_state_read_error_as_unhealthy(monkeypatch):
|
|
adapter = _make_adapter(monkeypatch, interval=0.005, threshold=1)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
bot.ws = _BrokenWebSocket()
|
|
return bot
|
|
|
|
handler = AsyncMock()
|
|
adapter.set_fatal_error_handler(handler)
|
|
await _connect(adapter, monkeypatch, factory)
|
|
|
|
await _wait_until(
|
|
lambda: handler.await_count,
|
|
"liveness loop did not surface a WebSocket state read error",
|
|
)
|
|
|
|
assert "socket_state_unavailable" in (adapter.fatal_error_message or "")
|
|
handler.assert_awaited_once()
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_probe_recovers_when_health_reader_raises(monkeypatch):
|
|
adapter = _make_adapter(monkeypatch, interval=0.005, threshold=1)
|
|
|
|
def factory(**kwargs):
|
|
return _LiveBot(
|
|
intents=kwargs["intents"],
|
|
allowed_mentions=kwargs.get("allowed_mentions"),
|
|
)
|
|
|
|
handler = AsyncMock()
|
|
adapter.set_fatal_error_handler(handler)
|
|
await _connect(adapter, monkeypatch, factory)
|
|
monkeypatch.setattr(
|
|
adapter,
|
|
"_read_websocket_health",
|
|
lambda _client: (_ for _ in ()).throw(RuntimeError("unexpected state")),
|
|
)
|
|
|
|
await _wait_until(
|
|
lambda: handler.await_count,
|
|
"liveness loop did not recover from health-reader failure",
|
|
)
|
|
|
|
assert "health_check_error" in (adapter.fatal_error_message or "")
|
|
handler.assert_awaited_once()
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_recovery_keeps_websocket_fatal_when_client_task_exits(monkeypatch):
|
|
"""The close callback must not replace stale-ACK recovery with task-exited."""
|
|
adapter = _make_adapter(monkeypatch, interval=0.005, threshold=1, max_ack_age=0.01)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
_set_websocket_health(bot, ack_age=3600)
|
|
return bot
|
|
|
|
handler = AsyncMock()
|
|
adapter.set_fatal_error_handler(handler)
|
|
await _connect(adapter, monkeypatch, factory)
|
|
|
|
await _wait_until(
|
|
lambda: handler.await_count,
|
|
"closed client task did not finish within 2s",
|
|
)
|
|
|
|
assert adapter._bot_task and adapter._bot_task.done()
|
|
assert adapter.fatal_error_code == "discord_websocket_health_stale"
|
|
assert handler.await_count == 1
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_recovery_not_blocked_by_hanging_client_close(monkeypatch):
|
|
"""A wedged close must not prevent fatal notification/reconnect queueing."""
|
|
adapter = _make_adapter(monkeypatch, interval=60, threshold=1, max_ack_age=1.0)
|
|
monkeypatch.setenv("HERMES_GATEWAY_ADAPTER_DISCONNECT_TIMEOUT", "0.02")
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
_set_websocket_health(bot, ack_age=3600)
|
|
bot.fetch_user = AsyncMock(return_value=SimpleNamespace(id=999))
|
|
return bot
|
|
|
|
handler = AsyncMock()
|
|
adapter.set_fatal_error_handler(handler)
|
|
await _connect(adapter, monkeypatch, factory)
|
|
wedged = adapter._client
|
|
close_started = asyncio.Event()
|
|
|
|
async def hanging_close():
|
|
close_started.set()
|
|
await asyncio.Event().wait()
|
|
|
|
wedged.close = hanging_close
|
|
adapter._set_fatal_error(
|
|
"discord_websocket_health_stale",
|
|
"Discord Gateway WebSocket health check failed: ack_stale",
|
|
retryable=True,
|
|
)
|
|
notify_task = asyncio.create_task(adapter._notify_liveness_fatal_error(wedged))
|
|
await asyncio.wait_for(close_started.wait(), timeout=0.5)
|
|
await asyncio.wait_for(notify_task, timeout=2.0)
|
|
assert close_started.is_set() is True
|
|
assert handler.await_count == 1
|
|
assert adapter.fatal_error_code == "discord_websocket_health_stale"
|
|
|
|
# Restore a cooperative fake close so the test can release the bot task.
|
|
wedged.close = _LiveBot.close.__get__(wedged, _LiveBot)
|
|
await adapter.disconnect()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_liveness_close_timeout_aborts_aiohttp_transport_before_fatal_notification(
|
|
monkeypatch,
|
|
):
|
|
"""A close handshake timeout must abort the stale socket before reconnect."""
|
|
adapter = _make_adapter(monkeypatch, interval=60, threshold=1, max_ack_age=1.0)
|
|
handler = AsyncMock()
|
|
adapter.set_fatal_error_handler(handler)
|
|
|
|
close_started = asyncio.Event()
|
|
release_close = asyncio.Event()
|
|
|
|
async def hanging_close():
|
|
close_started.set()
|
|
while not release_close.is_set():
|
|
try:
|
|
await release_close.wait()
|
|
except asyncio.CancelledError:
|
|
# Model a close path that catches cancellation while unwinding.
|
|
continue
|
|
|
|
transport = Mock()
|
|
replacement_transport = Mock()
|
|
aiohttp_socket = SimpleNamespace(
|
|
close=hanging_close,
|
|
# aiohttp clears response.connection while cancellation unwinds close(),
|
|
# but its WebSocket writer still owns the underlying transport.
|
|
_response=SimpleNamespace(connection=None),
|
|
_conn=None,
|
|
_writer=SimpleNamespace(transport=transport),
|
|
)
|
|
gateway_websocket = SimpleNamespace(socket=aiohttp_socket)
|
|
replacement_websocket = SimpleNamespace(
|
|
socket=SimpleNamespace(
|
|
_response=SimpleNamespace(connection=None),
|
|
_conn=None,
|
|
_writer=SimpleNamespace(transport=replacement_transport),
|
|
)
|
|
)
|
|
|
|
class _StickyCloseClient:
|
|
def __init__(self):
|
|
self.ws = gateway_websocket
|
|
self._closing_task = None
|
|
self.close_attempts = 0
|
|
|
|
async def close(self):
|
|
if self._closing_task is not None:
|
|
return await self._closing_task
|
|
|
|
async def _close():
|
|
self.close_attempts += 1
|
|
if self.close_attempts == 1:
|
|
# The library may publish a replacement WebSocket while the
|
|
# old close handshake is still stuck. Recovery must never
|
|
# abort the replacement transport.
|
|
self.ws = replacement_websocket
|
|
await hanging_close()
|
|
|
|
self._closing_task = asyncio.create_task(_close())
|
|
return await self._closing_task
|
|
|
|
client = _StickyCloseClient()
|
|
|
|
adapter._set_fatal_error(
|
|
"discord_websocket_health_stale",
|
|
"Discord Gateway WebSocket health check failed: socket_closed",
|
|
retryable=True,
|
|
)
|
|
notify_task = asyncio.create_task(adapter._notify_liveness_fatal_error(client))
|
|
|
|
await asyncio.wait_for(close_started.wait(), timeout=0.5)
|
|
done, _pending = await asyncio.wait({notify_task}, timeout=1.5)
|
|
finished_within_bound = notify_task in done
|
|
release_close.set()
|
|
if not notify_task.done():
|
|
await asyncio.wait_for(notify_task, timeout=0.5)
|
|
|
|
assert finished_within_bound is True
|
|
transport.abort.assert_called_once_with()
|
|
replacement_transport.abort.assert_not_called()
|
|
handler.assert_awaited_once()
|
|
assert client._closing_task is None
|
|
await client.close()
|
|
assert client.close_attempts == 2
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_disconnect_cancels_liveness_task(monkeypatch):
|
|
"""``disconnect()`` must cancel the probe so the gateway can shut down
|
|
cleanly without leaking a background task."""
|
|
adapter = _make_adapter(monkeypatch, interval=60, threshold=3)
|
|
|
|
def factory(**kwargs):
|
|
bot = _LiveBot(intents=kwargs["intents"], allowed_mentions=kwargs.get("allowed_mentions"))
|
|
bot.fetch_user = AsyncMock()
|
|
return bot
|
|
|
|
await _connect(adapter, monkeypatch, factory)
|
|
task = adapter._liveness_task
|
|
assert task is not None and not task.done()
|
|
|
|
await adapter.disconnect()
|
|
assert task.done()
|
|
assert adapter._liveness_task is None
|