From 81e0cf0d1df2d473133d9ff75911bfbbdb9d38db Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 14 Aug 2026 20:59:52 -0700
Subject: [PATCH] test: replace ingress waits with stop barriers (#123990)

---
 extensions/line/src/webhook-spool.test.ts      | 8 ++------
 extensions/msteams/src/msteams-ingress.test.ts | 8 ++------
 extensions/zalo/src/webhook-spool.test.ts      | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/extensions/line/src/webhook-spool.test.ts b/extensions/line/src/webhook-spool.test.ts
index d25b0fac1149..a33f95982972 100644
--- a/extensions/line/src/webhook-spool.test.ts
+++ b/extensions/line/src/webhook-spool.test.ts
@@ -518,9 +518,7 @@ describe("LINE webhook spool", () => {
         await waitForVerdict(queue, "message:message-event-duplicate", "completed");
 
         await spool.accept(callback(event));
-        await new Promise<void>((resolve) => {
-          setTimeout(resolve, 600);
-        });
+        await spool.stop();
 
         expect(deliver).toHaveBeenCalledTimes(1);
       } finally {
@@ -550,9 +548,7 @@ describe("LINE webhook spool", () => {
         await spool.accept(
           callback(createEvent({ webhookEventId: "delivery-b", messageId: "shared-message" })),
         );
-        await new Promise<void>((resolve) => {
-          setTimeout(resolve, 600);
-        });
+        await spool.stop();
 
         expect(deliver).toHaveBeenCalledTimes(1);
       } finally {
diff --git a/extensions/msteams/src/msteams-ingress.test.ts b/extensions/msteams/src/msteams-ingress.test.ts
index 9dcff7d6ced1..ed3b0ba34ba4 100644
--- a/extensions/msteams/src/msteams-ingress.test.ts
+++ b/extensions/msteams/src/msteams-ingress.test.ts
@@ -176,9 +176,7 @@ describe("Microsoft Teams durable ingress", () => {
         await ingress.accept(incoming);
         await waitForVerdict(queue, "activity-duplicate", "completed");
         await ingress.accept(incoming);
-        await new Promise<void>((resolve) => {
-          setTimeout(resolve, 600);
-        });
+        await ingress.stop();
         expect(dispatch).toHaveBeenCalledTimes(1);
       } finally {
         await ingress.stop();
@@ -199,9 +197,7 @@ describe("Microsoft Teams durable ingress", () => {
         await ingress.accept(first);
         await waitForVerdict(queue, "bot-framework-redelivery", "completed");
         await ingress.accept(redelivery);
-        await new Promise<void>((resolve) => {
-          setTimeout(resolve, 600);
-        });
+        await ingress.stop();
         expect(dispatch).toHaveBeenCalledTimes(1);
         expect(dispatch.mock.calls[0]?.[0]).toMatchObject({ text: "original" });
       } finally {
diff --git a/extensions/zalo/src/webhook-spool.test.ts b/extensions/zalo/src/webhook-spool.test.ts
index 9f16c3128f24..bdf256c6921e 100644
--- a/extensions/zalo/src/webhook-spool.test.ts
+++ b/extensions/zalo/src/webhook-spool.test.ts
@@ -134,9 +134,7 @@ describe("Zalo durable webhook ingress", () => {
         await ingress.accept(raw);
         await waitForZaloWebhookVerdict(queue, "duplicate", "completed");
         await ingress.accept(raw);
-        await new Promise<void>((resolve) => {
-          setTimeout(resolve, 600);
-        });
+        await ingress.stop();
         expect(deliver).toHaveBeenCalledTimes(1);
       } finally {
         await ingress.stop();
@@ -162,9 +160,7 @@ describe("Zalo durable webhook ingress", () => {
         await ingress.accept(
           rawEvent({ messageId: "redelivery", text: "transport redelivery", date: 2 }),
         );
-        await new Promise<void>((resolve) => {
-          setTimeout(resolve, 600);
-        });
+        await ingress.stop();
         expect(deliver).toHaveBeenCalledTimes(1);
         expect(deliver.mock.calls[0]?.[0].message?.text).toBe("original");
       } finally {