fix randomly failing test

socketio · Jun 20, 2023 · 8fc29d4 · 8fc29d4
1 parent baed014
commit 8fc29d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/manager.ts b/lib/manager.ts
@@ -348,10 +348,6 @@ export class Manager<
       const timeout = this._timeout;
       debug("connect attempt will timeout after %d", timeout);
 
-      if (timeout === 0) {
-        openSubDestroy(); // prevents a race condition with the 'open' event
-      }
-
       // set timer
       const timer = this.setTimeoutFn(() => {
         debug("connect attempt timed out after %d", timeout);

diff --git a/test/socket.ts b/test/socket.ts
@@ -75,7 +75,7 @@ describe("socket", () => {
       const socket = io(BASE_URL, {
         forceNew: true,
         transports: ["polling"],
-        timeout: 1,
+        timeout: 0,
       });
       socket.on("connect_error", (err) => {
         expect(err.message).to.eql("timeout");
@@ -90,7 +90,7 @@ describe("socket", () => {
       const socket = io(BASE_URL, {
         forceNew: true,
         transports: ["websocket"],
-        timeout: 1,
+        timeout: 0,
       });
       socket.on("connect_error", (err) => {
         expect(err.message).to.eql("timeout");

diff --git a/test/support/server.ts b/test/support/server.ts
@@ -5,6 +5,10 @@ export function createServer() {
   const server = new Server(3210, {
     pingInterval: 2000,
     connectionStateRecovery: {},
+    allowRequest: (req, callback) => {
+      // add a fixed delay to test the connection timeout on the client side
+      setTimeout(() => callback(null, true), 10);
+    },
   });
 
   server.of("/foo").on("connection", (socket) => {