mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
2558d28a9b
Production fixes: - Add clear_session_context() to hermes_logging.py (fixes 48 teardown errors) - Add clear_session() to tools/approval.py (fixes 9 setup errors) - Add SyncError M_UNKNOWN_TOKEN check to Matrix _sync_loop (bug fix) - Fall back to inline api_key in named custom providers when key_env is absent (runtime_provider.py) Test fixes: - test_memory_user_id: use builtin+external provider pair, fix honcho peer_name override test to match production behavior - test_display_config: remove TestHelpers for non-existent functions - test_auxiliary_client: fix OAuth tokens to match _is_oauth_token patterns, replace get_vision_auxiliary_client with resolve_vision_provider_client - test_cli_interrupt_subagent: add missing _execution_thread_id attr - test_compress_focus: add model/provider/api_key/base_url/api_mode to mock compressor - test_auth_provider_gate: add autouse fixture to clean Anthropic env vars that leak from CI secrets - test_opencode_go_in_model_list: accept both 'built-in' and 'hermes' source (models.dev API unavailable in CI) - test_email: verify email Platform enum membership instead of source inspection (build_channel_directory now uses dynamic enum loop) - test_feishu: add bot_added/bot_deleted handler mocks to _Builder - test_ws_auth_retry: add AsyncMock for sync_store.get_next_batch, add _pending_megolm and _joined_rooms to Matrix adapter mocks - test_restart_drain: monkeypatch-delete INVOCATION_ID (systemd sets this in CI, changing the restart call signature) - test_session_hygiene: add user_id to SessionSource - test_session_env: use relative baseline for contextvar clear check (pytest-xdist workers share context)
228 lines
7.1 KiB
Python
228 lines
7.1 KiB
Python
"""Tests for auth-aware retry in Mattermost WS and Matrix sync loops.
|
|
|
|
Both Mattermost's _ws_loop and Matrix's _sync_loop previously caught all
|
|
exceptions with a broad ``except Exception`` and retried forever. Permanent
|
|
auth failures (401, 403, M_UNKNOWN_TOKEN) would loop indefinitely instead
|
|
of stopping. These tests verify that auth errors now stop the reconnect.
|
|
"""
|
|
|
|
import asyncio
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Mattermost: _ws_loop auth-aware retry
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestMattermostWSAuthRetry:
|
|
"""gateway/platforms/mattermost.py — _ws_loop()"""
|
|
|
|
def test_401_handshake_stops_reconnect(self):
|
|
"""A WSServerHandshakeError with status 401 should stop the loop."""
|
|
import aiohttp
|
|
|
|
exc = aiohttp.WSServerHandshakeError(
|
|
request_info=MagicMock(),
|
|
history=(),
|
|
status=401,
|
|
message="Unauthorized",
|
|
headers=MagicMock(),
|
|
)
|
|
|
|
from gateway.platforms.mattermost import MattermostAdapter
|
|
adapter = MattermostAdapter.__new__(MattermostAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_connect():
|
|
nonlocal call_count
|
|
call_count += 1
|
|
raise exc
|
|
|
|
adapter._ws_connect_and_listen = fake_connect
|
|
|
|
asyncio.run(adapter._ws_loop())
|
|
|
|
# Should have attempted once and stopped, not retried
|
|
assert call_count == 1
|
|
|
|
def test_403_handshake_stops_reconnect(self):
|
|
"""A WSServerHandshakeError with status 403 should stop the loop."""
|
|
import aiohttp
|
|
|
|
exc = aiohttp.WSServerHandshakeError(
|
|
request_info=MagicMock(),
|
|
history=(),
|
|
status=403,
|
|
message="Forbidden",
|
|
headers=MagicMock(),
|
|
)
|
|
|
|
from gateway.platforms.mattermost import MattermostAdapter
|
|
adapter = MattermostAdapter.__new__(MattermostAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_connect():
|
|
nonlocal call_count
|
|
call_count += 1
|
|
raise exc
|
|
|
|
adapter._ws_connect_and_listen = fake_connect
|
|
|
|
asyncio.run(adapter._ws_loop())
|
|
assert call_count == 1
|
|
|
|
def test_transient_error_retries(self):
|
|
"""A transient ConnectionError should retry (not stop immediately)."""
|
|
from gateway.platforms.mattermost import MattermostAdapter
|
|
adapter = MattermostAdapter.__new__(MattermostAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_connect():
|
|
nonlocal call_count
|
|
call_count += 1
|
|
if call_count >= 2:
|
|
# Stop the loop after 2 attempts
|
|
adapter._closing = True
|
|
return
|
|
raise ConnectionError("connection reset")
|
|
|
|
adapter._ws_connect_and_listen = fake_connect
|
|
|
|
async def run():
|
|
with patch("asyncio.sleep", new_callable=AsyncMock):
|
|
await adapter._ws_loop()
|
|
|
|
asyncio.run(run())
|
|
|
|
# Should have retried at least once
|
|
assert call_count >= 2
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Matrix: _sync_loop auth-aware retry
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestMatrixSyncAuthRetry:
|
|
"""gateway/platforms/matrix.py — _sync_loop()"""
|
|
|
|
def test_unknown_token_sync_error_stops_loop(self):
|
|
"""A SyncError with M_UNKNOWN_TOKEN should stop syncing."""
|
|
import types
|
|
nio_mock = types.ModuleType("nio")
|
|
|
|
class SyncError:
|
|
def __init__(self, message):
|
|
self.message = message
|
|
|
|
nio_mock.SyncError = SyncError
|
|
|
|
from gateway.platforms.matrix import MatrixAdapter
|
|
adapter = MatrixAdapter.__new__(MatrixAdapter)
|
|
adapter._closing = False
|
|
|
|
sync_count = 0
|
|
|
|
async def fake_sync(timeout=30000, since=None):
|
|
nonlocal sync_count
|
|
sync_count += 1
|
|
return SyncError("M_UNKNOWN_TOKEN: Invalid access token")
|
|
|
|
adapter._client = MagicMock()
|
|
adapter._client.sync = fake_sync
|
|
adapter._client.sync_store = MagicMock()
|
|
adapter._client.sync_store.get_next_batch = AsyncMock(return_value=None)
|
|
adapter._pending_megolm = []
|
|
adapter._joined_rooms = set()
|
|
|
|
async def run():
|
|
import sys
|
|
sys.modules["nio"] = nio_mock
|
|
try:
|
|
await adapter._sync_loop()
|
|
finally:
|
|
del sys.modules["nio"]
|
|
|
|
asyncio.run(run())
|
|
assert sync_count == 1
|
|
|
|
def test_exception_with_401_stops_loop(self):
|
|
"""An exception containing '401' should stop syncing."""
|
|
from gateway.platforms.matrix import MatrixAdapter
|
|
adapter = MatrixAdapter.__new__(MatrixAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_sync(timeout=30000, since=None):
|
|
nonlocal call_count
|
|
call_count += 1
|
|
raise RuntimeError("HTTP 401 Unauthorized")
|
|
|
|
adapter._client = MagicMock()
|
|
adapter._client.sync = fake_sync
|
|
adapter._client.sync_store = MagicMock()
|
|
adapter._client.sync_store.get_next_batch = AsyncMock(return_value=None)
|
|
adapter._pending_megolm = []
|
|
adapter._joined_rooms = set()
|
|
|
|
async def run():
|
|
import types
|
|
nio_mock = types.ModuleType("nio")
|
|
nio_mock.SyncError = type("SyncError", (), {})
|
|
|
|
import sys
|
|
sys.modules["nio"] = nio_mock
|
|
try:
|
|
await adapter._sync_loop()
|
|
finally:
|
|
del sys.modules["nio"]
|
|
|
|
asyncio.run(run())
|
|
assert call_count == 1
|
|
|
|
def test_transient_error_retries(self):
|
|
"""A transient error should retry (not stop immediately)."""
|
|
from gateway.platforms.matrix import MatrixAdapter
|
|
adapter = MatrixAdapter.__new__(MatrixAdapter)
|
|
adapter._closing = False
|
|
|
|
call_count = 0
|
|
|
|
async def fake_sync(timeout=30000, since=None):
|
|
nonlocal call_count
|
|
call_count += 1
|
|
if call_count >= 2:
|
|
adapter._closing = True
|
|
return MagicMock() # Normal response
|
|
raise ConnectionError("network timeout")
|
|
|
|
adapter._client = MagicMock()
|
|
adapter._client.sync = fake_sync
|
|
adapter._client.sync_store = MagicMock()
|
|
adapter._client.sync_store.get_next_batch = AsyncMock(return_value=None)
|
|
adapter._pending_megolm = []
|
|
adapter._joined_rooms = set()
|
|
|
|
async def run():
|
|
import types
|
|
nio_mock = types.ModuleType("nio")
|
|
nio_mock.SyncError = type("SyncError", (), {})
|
|
|
|
import sys
|
|
sys.modules["nio"] = nio_mock
|
|
try:
|
|
with patch("asyncio.sleep", new_callable=AsyncMock):
|
|
await adapter._sync_loop()
|
|
finally:
|
|
del sys.modules["nio"]
|
|
|
|
asyncio.run(run())
|
|
assert call_count >= 2
|