mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-30 19:09:28 +00:00
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
133 lines
4.9 KiB
Python
133 lines
4.9 KiB
Python
import sys
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
|
|
from gateway.config import PlatformConfig
|
|
|
|
|
|
def _ensure_telegram_mock():
|
|
if "telegram" in sys.modules and hasattr(sys.modules["telegram"], "__file__"):
|
|
return
|
|
telegram_mod = MagicMock()
|
|
telegram_mod.ext.ContextTypes.DEFAULT_TYPE = type(None)
|
|
telegram_mod.constants.ParseMode.MARKDOWN_V2 = "MarkdownV2"
|
|
telegram_mod.constants.ChatType.GROUP = "group"
|
|
telegram_mod.constants.ChatType.SUPERGROUP = "supergroup"
|
|
telegram_mod.constants.ChatType.CHANNEL = "channel"
|
|
telegram_mod.constants.ChatType.PRIVATE = "private"
|
|
telegram_mod.error.NetworkError = type("NetworkError", (OSError,), {})
|
|
telegram_mod.error.TimedOut = type("TimedOut", (OSError,), {})
|
|
for name in ("telegram", "telegram.ext", "telegram.constants", "telegram.request"):
|
|
sys.modules.setdefault(name, telegram_mod)
|
|
sys.modules.setdefault("telegram.error", telegram_mod.error)
|
|
|
|
|
|
_ensure_telegram_mock()
|
|
|
|
from plugins.platforms.telegram import adapter as tg_adapter # noqa: E402
|
|
from plugins.platforms.telegram.adapter import TelegramAdapter # noqa: E402
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_await_with_thread_deadline_abandons_and_runs_cleanup_on_timeout():
|
|
"""A wedged awaitable must raise TimeoutError promptly AND trigger the
|
|
best-effort on_abandon cleanup (the httpx-pool-leak guard).
|
|
|
|
This exercises the REAL _await_with_thread_deadline (not a monkeypatched
|
|
stub), covering the abandonment + cleanup mechanism directly.
|
|
"""
|
|
import asyncio as _asyncio
|
|
import time as _time
|
|
|
|
cleanup_ran = _asyncio.Event()
|
|
|
|
async def _wedged():
|
|
# Swallows cancellation for a bounded window — long enough that the
|
|
# helper must return control BEFORE this finishes (proving it doesn't
|
|
# await cancellation, the #58236 shielded-scope behavior), but bounded
|
|
# so the abandoned task can't outlive the test and wedge teardown.
|
|
for _ in range(20):
|
|
try:
|
|
await _asyncio.sleep(0.05)
|
|
except _asyncio.CancelledError:
|
|
# Keep going despite cancellation, like the shielded scope.
|
|
pass
|
|
|
|
async def _cleanup():
|
|
cleanup_ran.set()
|
|
|
|
started = _time.monotonic()
|
|
with pytest.raises(_asyncio.TimeoutError):
|
|
await tg_adapter._await_with_thread_deadline(
|
|
_wedged(), timeout=0.2, on_abandon=_cleanup
|
|
)
|
|
elapsed = _time.monotonic() - started
|
|
|
|
# Returned control promptly — well before the wedged coroutine's ~1s span.
|
|
assert elapsed < 0.8
|
|
# The detached cleanup was scheduled; give the loop a tick to run it.
|
|
await _asyncio.wait_for(cleanup_ran.wait(), timeout=2.0)
|
|
assert cleanup_ran.is_set()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_await_with_thread_deadline_cleanup_error_is_swallowed():
|
|
"""A cleanup that raises must not surface as an unhandled task error."""
|
|
import asyncio as _asyncio
|
|
|
|
async def _wedged():
|
|
for _ in range(20):
|
|
try:
|
|
await _asyncio.sleep(0.05)
|
|
except _asyncio.CancelledError:
|
|
pass
|
|
|
|
def _boom():
|
|
raise RuntimeError("cleanup blew up")
|
|
|
|
# Must still raise TimeoutError (not the cleanup error) and not crash.
|
|
with pytest.raises(_asyncio.TimeoutError):
|
|
await tg_adapter._await_with_thread_deadline(
|
|
_wedged(), timeout=0.2, on_abandon=_boom
|
|
)
|
|
# Let the detached cleanup task run and be observed (no unraised error).
|
|
await _asyncio.sleep(0.05)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_blocked_loop_after_expiry_dumps_diagnostics(monkeypatch):
|
|
"""#63309: when the loop thread is stuck in a synchronous call, the expiry
|
|
callback never runs and every asyncio timeout goes silent. The off-loop
|
|
watchdog must detect that state and emit diagnostics from its own thread."""
|
|
import asyncio as _asyncio
|
|
import time as _time
|
|
|
|
dumps = []
|
|
monkeypatch.setattr(
|
|
tg_adapter,
|
|
"_dump_loop_blocked_diagnostics",
|
|
lambda timeout, grace: dumps.append((timeout, grace)),
|
|
)
|
|
monkeypatch.setattr(tg_adapter, "_LOOP_BLOCKED_DUMP_GRACE", 0.15)
|
|
|
|
hung = _asyncio.get_running_loop().create_future() # never completes
|
|
task = _asyncio.ensure_future(
|
|
tg_adapter._await_with_thread_deadline(hung, timeout=0.05)
|
|
)
|
|
# Let the helper start its deadline + watchdog timers…
|
|
await _asyncio.sleep(0)
|
|
# …then block the event loop straight through deadline (0.05s) AND the
|
|
# watchdog grace (0.15s): call_soon_threadsafe stays queued, exactly like
|
|
# a sync call pinning the loop during Application.initialize().
|
|
# Margin matters: the watchdog thread only dumps if the loop is STILL
|
|
# blocked when it wakes, and thread wakeup lags under parallel-suite load.
|
|
# 0.2s (= deadline+grace exactly) flaked in a 40-worker full-suite run.
|
|
_time.sleep(1.0)
|
|
with pytest.raises(_asyncio.TimeoutError):
|
|
await task
|
|
|
|
assert dumps == [(0.05, 0.15)]
|
|
hung.cancel()
|
|
|
|
|