From e2795bb170442183232ac429f7653dbd502b2566 Mon Sep 17 00:00:00 2001
From: Skylm808 <lmtian808@gmail.com>
Date: Tue, 20 Oct 2026 11:18:27 +0800
Subject: [PATCH] fix: tolerate multiple scheduler activations in trace test

---
 tests/builtin/runtime/test_scheduler.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/builtin/runtime/test_scheduler.py b/tests/builtin/runtime/test_scheduler.py
index f1e1934dfe..913d806acc 100644
--- a/tests/builtin/runtime/test_scheduler.py
+++ b/tests/builtin/runtime/test_scheduler.py
@@ -18,6 +18,7 @@
 import json
 import logging
 import sqlite3
+from collections import Counter
 from contextlib import asynccontextmanager
 from typing import Any
 
@@ -570,17 +571,24 @@ async def scenario() -> None:
         assert current_request_id() is None
         try:
             dispatched = triggers.dispatched if family == "memory" else incubation.dispatched
-            await asyncio.wait_for(dispatched.wait(), timeout=3)
-            records = [r for r in caplog.records if getattr(r, "event", None) == "background.operation.completed"]
-            assert records
-            assert all(r.outcome == "success" for r in records)
-            assert all(r.request_id is None for r in records)
-            roots = [s for s in exporter.get_finished_spans() if s.name.startswith("scheduled.")]
-            assert roots and all(s.parent is None for s in roots)
-            assert all(r.trace_id == format(roots[0].context.trace_id, "032x") for r in records)
+            # Exercise multiple activations without assuming how many run before shutdown.
+            for _ in range(2):
+                await asyncio.wait_for(dispatched.wait(), timeout=3)
+                dispatched.clear()
         finally:
             await runtime.close()
 
+        records = [r for r in caplog.records if getattr(r, "event", None) == "background.operation.completed"]
+        assert records
+        assert all(r.outcome == "success" for r in records)
+        assert all(r.request_id is None for r in records)
+        roots = [s for s in exporter.get_finished_spans() if s.name.startswith("scheduled.")]
+        assert len(roots) >= 2 and all(s.parent is None for s in roots)
+        assert len({s.context.trace_id for s in roots}) == len(roots)
+        assert Counter((r.trace_id, r.span_id) for r in records) == Counter(
+            (format(s.context.trace_id, "032x"), format(s.context.span_id, "016x")) for s in roots
+        )
+
     try:
         asyncio.run(scenario())
     finally: