test: stabilize channel mocks under load

steipete · steipete · commit 5f8300a80cdc · 2026-07-05T12:23:18.000-07:00
diff --git a/extensions/matrix/src/approval-reactions.test.ts b/extensions/matrix/src/approval-reactions.test.ts
@@ -10,6 +10,16 @@ import {
 } from "./approval-reactions.js";
 import { setMatrixRuntime } from "./runtime.js";
 
+function createRuntimeLogger(overrides: { warn?: ReturnType<typeof vi.fn> } = {}) {
+  // Runtime state survives no-isolate workers, so expose every logger method later files may call.
+  return {
+    debug: vi.fn(),
+    info: vi.fn(),
+    warn: overrides.warn ?? vi.fn(),
+    error: vi.fn(),
+  };
+}
+
 afterEach(() => {
   clearMatrixApprovalReactionTargetsForTest();
   vi.restoreAllMocks();
@@ -124,7 +134,7 @@ describe("matrix approval reactions", () => {
     }));
     setMatrixRuntime({
       state: { openKeyedStore },
-      logging: { getChildLogger: () => ({ warn: vi.fn() }) },
+      logging: { getChildLogger: () => createRuntimeLogger() },
     } as never);
 
     registerMatrixApprovalReactionTarget({
@@ -165,7 +175,7 @@ describe("matrix approval reactions", () => {
           throw new Error("sqlite unavailable");
         }),
       },
-      logging: { getChildLogger: () => ({ warn }) },
+      logging: { getChildLogger: () => createRuntimeLogger({ warn }) },
     } as never);
 
     registerMatrixApprovalReactionTarget({
diff --git a/extensions/whatsapp/src/monitor-inbox.captures-media-path-image-messages.test-support.ts b/extensions/whatsapp/src/monitor-inbox.captures-media-path-image-messages.test-support.ts
@@ -8,8 +8,6 @@ import {
   getSock,
   installWebMonitorInboxUnitTestHooks,
   mockLoadConfig,
-  settleInboundWork,
-  waitForMessageCalls,
 } from "./monitor-inbox.test-harness.js";
 let monitorWebInbox: typeof import("./inbound.js").monitorWebInbox;
 const inboundLoggerInfoMock = vi.hoisted(() => vi.fn());
@@ -37,23 +35,45 @@ describe("web monitor inbox", () => {
     monitorWebInbox = getMonitorWebInbox();
   });
 
-  async function openMonitor(onMessage = vi.fn()) {
+  async function openMonitor(
+    onMessage = vi.fn(),
+    extraOptions: Partial<Parameters<typeof monitorWebInbox>[0]> = {},
+  ) {
     return await monitorWebInbox({
       cfg: mockLoadConfig() as never,
       verbose: false,
       accountId: DEFAULT_ACCOUNT_ID,
       authDir: getAuthDir(),
       onMessage,
+      ...extraOptions,
     });
   }
 
   async function runSingleUpsertAndCapture(upsert: unknown) {
     const onMessage = vi.fn();
-    const listener = await openMonitor(onMessage);
+    let armed = false;
+    let observedPendingWork = false;
+    let resolvePendingWorkDrained!: () => void;
+    const pendingWorkDrained = new Promise<void>((resolve) => {
+      resolvePendingWorkDrained = resolve;
+    });
+    const listener = await openMonitor(onMessage, {
+      onPendingWorkChanged: (pendingWorkCount) => {
+        if (!armed) {
+          return;
+        }
+        if (pendingWorkCount > 0) {
+          observedPendingWork = true;
+        } else if (observedPendingWork) {
+          resolvePendingWorkDrained();
+        }
+      },
+    });
     const sock = getSock();
+    // The monitor owns async media and delivery work; wait for its drain signal instead of polling.
+    armed = true;
     sock.ev.emit("messages.upsert", upsert);
-    await waitForMessageCalls(onMessage, 1);
-    await settleInboundWork();
+    await pendingWorkDrained;
     return { onMessage, listener, sock };
   }
 
