Cleanup

getsentry · Jul 21, 2023 · c0a059f · c0a059f
1 parent 2285132
commit c0a059f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/packages/node-integration-tests/utils/index.ts b/packages/node-integration-tests/utils/index.ts
@@ -132,16 +132,6 @@ export class TestEnv {
     this.server = server;
     this.url = url;
     this._terminator = createHttpTerminator({ server: this.server, gracefulTerminationTimeout: 0 });
-
-    // We need to destroy the socket after the response has been sent
-    // to prevent the server.close (called inside nock interceptor) from hanging in tests.
-    // Otherwise the tests may timeout. (Happening on Node 20)
-    // See: https://github.com/nodejs/node/issues/2642
-    this.server.on('request', (req, res) => {
-      res.on('finish', () => {
-        req.socket.end();
-      });
-    });
   }
 
   /**

diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -68,14 +68,14 @@
     "lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
     "test": "yarn test:unit",
     "test:integration": "run-s test:integration:v1 test:integration:v2",
-    "test:integration:v1": "run-s test:integration:prepare test:integration:client test:integration:server",
+    "test:integration:v1": "run-s test:integration:clean test:integration:prepare test:integration:client test:integration:server",
     "test:integration:v2": "export REMIX_VERSION=2 && run-s test:integration:v1",
     "test:integration:ci": "run-s test:integration:clean test:integration:prepare test:integration:client:ci test:integration:server",
     "test:integration:prepare": "(cd test/integration && yarn)",
     "test:integration:clean": "(cd test/integration && rimraf .cache node_modules build)",
     "test:integration:client": "yarn playwright install-deps && yarn playwright test test/integration/test/client/",
     "test:integration:client:ci": "yarn test:integration:client --browser='all' --reporter='line'",
-    "test:integration:server": "export NODE_OPTIONS='--stack-trace-limit=25' && jest --runInBand --config=test/integration/jest.config.js test/integration/test/server/",
+    "test:integration:server": "export NODE_OPTIONS='--stack-trace-limit=25' && jest --config=test/integration/jest.config.js test/integration/test/server/",
     "test:unit": "jest",
     "test:watch": "jest --watch",
     "yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push"

diff --git a/packages/remix/test/integration/jest.config.js b/packages/remix/test/integration/jest.config.js
@@ -6,5 +6,4 @@ module.exports = {
   testPathIgnorePatterns: [`${__dirname}/test/client`],
   detectOpenHandles: true,
   forceExit: true,
-  testTimeout: 10000,
 };