mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
39975613b1
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.
47 lines
1.6 KiB
Python
47 lines
1.6 KiB
Python
"""Regression tests for #58818.
|
|
|
|
On restart the gateway must drain an in-flight cron delivery instead of
|
|
dropping it. A cron delivery is a coroutine scheduled onto the gateway event
|
|
loop (``safe_schedule_threadsafe``) while the ticker thread blocks on its
|
|
future. The shutdown wait therefore must NOT block the loop with a synchronous
|
|
``thread.join()`` — doing so deadlocks the delivery (the loop can never run it)
|
|
and the message is silently lost. ``_await_thread_exit`` waits cooperatively so
|
|
the pending delivery completes first.
|
|
"""
|
|
import asyncio
|
|
import threading
|
|
|
|
import pytest
|
|
|
|
import gateway.run as gateway_run
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_await_thread_exit_lets_loop_scheduled_delivery_complete():
|
|
# Reproduces the drop: the worker schedules a coroutine onto THIS loop and
|
|
# blocks on its result, exactly like cron/_deliver_result. A blocking join
|
|
# would deadlock it; the cooperative wait lets it finish.
|
|
loop = asyncio.get_running_loop()
|
|
delivered = threading.Event()
|
|
worker_done = threading.Event()
|
|
|
|
async def _delivery():
|
|
await asyncio.sleep(0.05)
|
|
delivered.set()
|
|
return "ok"
|
|
|
|
def _cron_worker():
|
|
fut = asyncio.run_coroutine_threadsafe(_delivery(), loop)
|
|
fut.result(timeout=10)
|
|
worker_done.set()
|
|
|
|
thread = threading.Thread(target=_cron_worker, daemon=True)
|
|
thread.start()
|
|
|
|
exited = await gateway_run._await_thread_exit(thread, timeout=10)
|
|
|
|
assert exited is True
|
|
assert delivered.is_set(), "in-flight delivery coroutine never ran (loop was blocked)"
|
|
assert worker_done.is_set()
|
|
|
|
|