From 37cd6027cf8793be8f07e3ecdd6e2f7c570731c7 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 27 Apr 2026 08:11:05 +0100
Subject: [PATCH] test(gateway): harden session event setup timeout

---
 src/gateway/session-message-events.test.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/gateway/session-message-events.test.ts b/src/gateway/session-message-events.test.ts
index 6d375f7dd2d..4d8f89de4f1 100644
--- a/src/gateway/session-message-events.test.ts
+++ b/src/gateway/session-message-events.test.ts
@@ -19,6 +19,7 @@ import {
 installGatewayTestHooks({ scope: "suite" });
 
 const cleanupDirs: string[] = [];
+const SETUP_RPC_TIMEOUT_MS = 30_000;
 let harness: Awaited<ReturnType<typeof createGatewaySuiteHarness>>;
 let subscribedOperatorWs:
   | Awaited<ReturnType<Awaited<ReturnType<typeof createGatewaySuiteHarness>>["openWs"]>>
@@ -30,13 +31,18 @@ beforeAll(async () => {
   delete process.env.OPENCLAW_TEST_MINIMAL_GATEWAY;
   harness = await createGatewaySuiteHarness();
   subscribedOperatorWs = await harness.openWs();
-  await connectOk(subscribedOperatorWs, { scopes: ["operator.read"] });
-  await rpcReq(subscribedOperatorWs, "sessions.subscribe");
-});
+  await connectOk(subscribedOperatorWs, {
+    scopes: ["operator.read"],
+    timeoutMs: SETUP_RPC_TIMEOUT_MS,
+  });
+  await rpcReq(subscribedOperatorWs, "sessions.subscribe", undefined, SETUP_RPC_TIMEOUT_MS);
+}, 60_000);
 
 afterAll(async () => {
   subscribedOperatorWs?.close();
-  await harness.close();
+  if (harness) {
+    await harness.close();
+  }
   if (previousMinimalGateway === undefined) {
     delete process.env.OPENCLAW_TEST_MINIMAL_GATEWAY;
   } else {