Avoid port race condition (finally pls)

getsentry · Sep 12, 2022 · dd5fe3f · dd5fe3f
1 parent b86bdb7
commit dd5fe3f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/packages/node-integration-tests/package.json b/packages/node-integration-tests/package.json
@@ -34,8 +34,7 @@
     "mongodb-memory-server-global": "^7.6.3",
     "mysql": "^2.18.1",
     "nock": "^13.1.0",
-    "pg": "^8.7.3",
-    "portfinder": "^1.0.28"
+    "pg": "^8.7.3"
   },
   "config": {
     "mongodbMemoryServer": {

diff --git a/packages/node-integration-tests/utils/index.ts b/packages/node-integration-tests/utils/index.ts
@@ -5,9 +5,9 @@ import { logger, parseSemver } from '@sentry/utils';
 import axios, { AxiosRequestConfig } from 'axios';
 import { Express } from 'express';
 import * as http from 'http';
+import { AddressInfo } from 'net';
 import nock from 'nock';
 import * as path from 'path';
-import { getPorts } from 'portfinder';
 
 export type TestServerConfig = {
   url: string;
@@ -151,20 +151,9 @@ export class TestEnv {
         }
       });
 
-      getPorts(50, {}, (err, ports) => {
-        if (err) {
-          throw err;
-        }
-
-        const port = ports.find(
-          // Only allow ports that do not overlap with other workers - this is done to avoid race-conditions
-          p => p % Number(process.env.TEST_WORKERS_AMOUNT) === Number(process.env.TEST_PORT_MODULO),
-        );
-
-        const url = `http://localhost:${port}/test`;
-        const server = app.listen(port, () => {
-          resolve([server, url]);
-        });
+      const server = app.listen(0, () => {
+        const url = `http://localhost:${(server.address() as AddressInfo).port}/test`;
+        resolve([server, url]);
       });
     });
 

diff --git a/packages/node-integration-tests/utils/run-tests.ts b/packages/node-integration-tests/utils/run-tests.ts
@@ -13,11 +13,7 @@ const threads = os.cpus().map(async (_, i) => {
   while (testPath !== undefined) {
     console.log(`(Worker ${i}) Running test "${testPath}"`);
     await new Promise(resolve => {
-      const p = childProcess.spawn('jest', ['--runTestsByPath', testPath as string, '--forceExit'], {
-        // These env vars are used to give workers a limited, non-overlapping set of ports to occupy.
-        // This is done to avoid race-conditions during port reservation.
-        env: { ...process.env, TEST_WORKERS_AMOUNT: String(os.cpus().length), TEST_PORT_MODULO: String(i) },
-      });
+      const p = childProcess.spawn('jest', ['--runTestsByPath', testPath as string, '--forceExit']);
 
       let output = '';
 

diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -34,7 +34,8 @@
   },
   "devDependencies": {
     "@remix-run/node": "^1.4.3",
-    "@remix-run/react": "^1.4.3"
+    "@remix-run/react": "^1.4.3",
+    "portfinder": "^1.0.28"
   },
   "peerDependencies": {
     "@remix-run/node": "1.x",