mirror of
https://github.com/shy3130/tick-stock-panel.git
synced 2026-11-02 10:26:13 +00:00
shy3130
4c7f7be484
_loop 的 except BaseException 把 task.cancel() 送来的 CancelledError 当 "探测失败"吞掉并继续循环: 当 cancel 恰好落在 wait_for(to_thread) 内时 (而非轮间的 sleep), 任务永不结束, stop() 的 await self._task 永久挂起 — 生产关闭 (lifespan) 与测试收尾均会死锁, 全量测试偶发卡死 45min+ 的根因。 修复: CancelledError 单独穿透; 新增确定性回归测试 (任务停在探测内时 stop 必须立刻返回)。纯 asyncio 200 次压测复现脚本由必挂转全过。 顺带说明: 本机旧 venv 装的是 polars 1.40/py 慢版本而 lock 早已钉 pytest 9/polars 1.44, fresh clone 同样命中; 现已同步 venv 到 lock 口径, 全量 2395 passed / 96s。
86 lines
2.4 KiB
Python
86 lines
2.4 KiB
Python
"""看门狗触发逻辑测试 (不真退出进程)。"""
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
|
|
from app.watchdog import HealthWatchdog, default_probe
|
|
|
|
|
|
async def _run_watchdog(probe_results, *, threshold=2, interval=0.01, timeout=0.2):
|
|
exits: list[int] = []
|
|
idx = 0
|
|
|
|
def probe() -> None:
|
|
nonlocal idx
|
|
if idx < len(probe_results):
|
|
result = probe_results[idx]
|
|
idx += 1
|
|
if isinstance(result, BaseException):
|
|
raise result
|
|
# 脚本耗尽后恒为成功
|
|
|
|
wd = HealthWatchdog(
|
|
probe,
|
|
exit_cb=exits.append,
|
|
interval_s=interval,
|
|
probe_timeout_s=timeout,
|
|
failure_threshold=threshold,
|
|
)
|
|
wd.start()
|
|
for _ in range(50):
|
|
await asyncio.sleep(0.02)
|
|
if exits or wd._task.done():
|
|
break
|
|
await wd.stop()
|
|
return exits
|
|
|
|
|
|
async def test_consecutive_failures_trigger_exit() -> None:
|
|
exits = await _run_watchdog([RuntimeError("wedge"), TimeoutError("wedge")])
|
|
assert exits == [70]
|
|
|
|
|
|
async def test_success_resets_failure_counter() -> None:
|
|
# 失败 1 次 → 成功 → 再失败 1 次: 未达连续阈值, 不退出。
|
|
exits = await _run_watchdog([RuntimeError("slow"), None, RuntimeError("slow")])
|
|
assert exits == []
|
|
|
|
|
|
async def test_stop_cancels_task_parked_inside_probe() -> None:
|
|
# 回归: stop() 的 cancel 若落在 wait_for(to_thread) 内, 旧实现把
|
|
# CancelledError 当"探测失败"吞掉 → 循环不退出 → stop() 永久挂起。
|
|
import threading
|
|
import time
|
|
|
|
entered = threading.Event()
|
|
release = threading.Event()
|
|
|
|
def blocking_probe() -> None:
|
|
entered.set()
|
|
release.wait(5)
|
|
|
|
wd = HealthWatchdog(
|
|
blocking_probe,
|
|
exit_cb=lambda code: None,
|
|
interval_s=0.01,
|
|
probe_timeout_s=10,
|
|
failure_threshold=99,
|
|
)
|
|
wd.start()
|
|
# 等探测线程真正进入阻塞 (此刻任务恰好停在 wait_for 内), 再 stop
|
|
await asyncio.to_thread(entered.wait, 2)
|
|
try:
|
|
t0 = time.monotonic()
|
|
await asyncio.wait_for(wd.stop(), timeout=3)
|
|
assert time.monotonic() - t0 < 3, "stop() 应立即取消探测中的任务, 而非挂起"
|
|
finally:
|
|
release.set()
|
|
|
|
|
|
async def test_default_probe_passes_on_healthy_resources() -> None:
|
|
import threading
|
|
|
|
lock = threading.Lock()
|
|
default_probe(lock) # 不抛即通过
|
|
default_probe(None)
|