From 3a6e0e70f624a3380ec81eb6b50a0e54214593b9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 22 Feb 2026 12:18:21 +0000
Subject: [PATCH] test: make gateway connectReq timeout configurable

---
 src/gateway/server.node-invoke-approval-bypass.test.ts | 2 ++
 src/gateway/test-helpers.server.ts                     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gateway/server.node-invoke-approval-bypass.test.ts b/src/gateway/server.node-invoke-approval-bypass.test.ts
index f1b3255bc1c..506935ad96a 100644
--- a/src/gateway/server.node-invoke-approval-bypass.test.ts
+++ b/src/gateway/server.node-invoke-approval-bypass.test.ts
@@ -21,6 +21,7 @@ import {
 
 installGatewayTestHooks({ scope: "suite" });
 const NODE_CONNECT_TIMEOUT_MS = 3_000;
+const CONNECT_REQ_TIMEOUT_MS = 2_000;
 
 async function expectNoForwardedInvoke(hasInvoke: () => boolean): Promise<void> {
   // Yield a couple of macrotasks so any accidental async forwarding would fire.
@@ -107,6 +108,7 @@ describe("node.invoke approval bypass", () => {
         token: "secret",
         scopes,
         ...(resolveDevice ? { device: resolveDevice(await nonce) } : {}),
+        timeoutMs: CONNECT_REQ_TIMEOUT_MS,
       });
       return { ws, res };
     };
diff --git a/src/gateway/test-helpers.server.ts b/src/gateway/test-helpers.server.ts
index d697f23ae99..a9b7ef9fede 100644
--- a/src/gateway/test-helpers.server.ts
+++ b/src/gateway/test-helpers.server.ts
@@ -469,6 +469,7 @@ export async function connectReq(
       nonce?: string;
     } | null;
     skipConnectChallengeNonce?: boolean;
+    timeoutMs?: number;
   },
 ): Promise<ConnectResponse> {
   const { randomUUID } = await import("node:crypto");
@@ -566,7 +567,7 @@ export async function connectReq(
     const rec = o as Record<string, unknown>;
     return rec.type === "res" && rec.id === id;
   };
-  return await onceMessage<ConnectResponse>(ws, isResponseForId);
+  return await onceMessage<ConnectResponse>(ws, isResponseForId, opts?.timeoutMs);
 }
 
 export async function connectOk(ws: WebSocket, opts?: Parameters<typeof connectReq>[1]) {