mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-30 19:09:28 +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.
59 lines
1.8 KiB
Python
59 lines
1.8 KiB
Python
"""Regression tests for the Feishu adapter's owned SDK executor.
|
|
|
|
Blocking Feishu SDK calls used to run on asyncio's shared default executor.
|
|
When that executor was torn down (agent thread exit / loop cleanup), every
|
|
subsequent send failed permanently with "Executor shutdown has been called"
|
|
and the gateway became a zombie. The adapter now owns its own
|
|
ThreadPoolExecutor and recreates it on demand if it has been shut down.
|
|
|
|
Covers: #10849
|
|
"""
|
|
import concurrent.futures
|
|
|
|
import pytest
|
|
|
|
from plugins.platforms.feishu.adapter import FeishuAdapter
|
|
|
|
|
|
def _bare_adapter() -> FeishuAdapter:
|
|
"""A FeishuAdapter with only the executor fields wired (no __init__)."""
|
|
adapter = object.__new__(FeishuAdapter)
|
|
import threading
|
|
|
|
adapter._sdk_executor_lock = threading.Lock()
|
|
adapter._sdk_executor = None
|
|
adapter._sdk_executor_closing = False
|
|
return adapter
|
|
|
|
|
|
def test_get_executor_recreates_after_shutdown():
|
|
"""A shut-down pool must be transparently replaced — the #10849 recovery."""
|
|
adapter = _bare_adapter()
|
|
first = adapter._get_sdk_executor()
|
|
first.shutdown(wait=True)
|
|
assert getattr(first, "_shutdown", False) is True
|
|
|
|
second = adapter._get_sdk_executor()
|
|
assert second is not first
|
|
assert getattr(second, "_shutdown", False) is False
|
|
adapter._shutdown_sdk_executor()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_run_blocking_executes_on_owned_pool():
|
|
adapter = _bare_adapter()
|
|
captured = {}
|
|
|
|
def _work(value):
|
|
import threading
|
|
|
|
captured["thread"] = threading.current_thread().name
|
|
return value * 2
|
|
|
|
result = await adapter._run_blocking(_work, 21)
|
|
assert result == 42
|
|
# Ran on the adapter-owned pool, not the default executor.
|
|
assert captured["thread"].startswith("hermes-feishu-sdk")
|
|
adapter._shutdown_sdk_executor()
|
|
|
|
|