Fix leak tests

ardatan · Oct 25, 2023 · 058818b · 058818b
1 parent 901c33a
commit 058818b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -25,7 +25,7 @@ module.exports = {
   collectCoverage: false,
   globals: {
     uwsUtils: require('./uwsUtils'),
-    libcurl: process.env.LEAK_TEST ? undefined : require('node-libcurl'),
+    libcurl: require('node-libcurl'),
   },
   cacheDirectory: resolve(ROOT_DIR, `${CI ? '' : 'node_modules/'}.cache/jest`),
   resolver: 'bob-the-bundler/jest-resolver',

diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
     "prettier": "prettier --ignore-path .gitignore --ignore-path .prettierignore --write --list-different .",
     "prettier:check": "prettier --ignore-path .gitignore --ignore-path .prettierignore --check .",
     "release": "changeset publish",
-    "test": "jest --forceExit",
-    "test:leaks": "LEAK_TEST=1 jest --detectOpenHandles --detectLeaks --logHeapUsage --forceExit",
+    "test": "jest --runInBand --forceExit",
+    "test:leaks": "LEAK_TEST=1 jest --runInBand --detectOpenHandles --detectLeaks --logHeapUsage --forceExit",
     "ts:check": "tsc --noEmit"
   },
   "devDependencies": {

diff --git a/packages/server/test/test-fetch.ts b/packages/server/test/test-fetch.ts
@@ -1,6 +1,6 @@
 const libcurl = globalThis.libcurl;
 export function runTestsForEachFetchImpl(callback: () => void) {
-  if (!process.env.LEAK_TEST) {
+  if (!libcurl) {
     describe('libcurl', () => {
       callback();
     });

diff --git a/packages/server/test/test-server.ts b/packages/server/test/test-server.ts
@@ -55,11 +55,14 @@ export function createNodeHttpTestServer(): Promise<TestServer> {
   });
 }
 
-export const serverImplMap = {
+export const serverImplMap: Record<string, () => Promise<TestServer>> = {
   nodeHttp: createNodeHttpTestServer,
-  uWebSockets: createUWSTestServer,
 };
 
+if ((globalThis as any)['uwsUtils']) {
+  serverImplMap.uWebSockets = createUWSTestServer;
+}
+
 export function runTestsForEachServerImpl(callback: (server: TestServer) => void) {
   for (const serverImplName in serverImplMap) {
     describe(serverImplName, () => {