test_runner: cleanup global event listeners after run

PR-URL: #53878 Fixes: #53868 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Jul 28, 2024 · 2bbdba9 · 2bbdba9
1 parent 33e406e
commit 2bbdba9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
@@ -170,8 +170,13 @@ function setup(root) {
       kCancelledByParent));
 
     hook.disable();
-    process.removeListener('unhandledRejection', rejectionHandler);
     process.removeListener('uncaughtException', exceptionHandler);
+    process.removeListener('unhandledRejection', rejectionHandler);
+    process.removeListener('beforeExit', exitHandler);
+    if (globalOptions.isTestRunner) {
+      process.removeListener('SIGINT', terminationHandler);
+      process.removeListener('SIGTERM', terminationHandler);
+    }
   };
 
   const terminationHandler = () => {

diff --git a/lib/internal/test_runner/runner.js b/lib/internal/test_runner/runner.js
@@ -564,6 +564,7 @@ function run(options = kEmptyObject) {
   }
 
   let postRun = () => root.postRun();
+  let teardown = () => root.harness.teardown();
   let filesWatcher;
   const opts = {
     __proto__: null,
@@ -578,6 +579,7 @@ function run(options = kEmptyObject) {
   if (watch) {
     filesWatcher = watchFiles(testFiles, opts);
     postRun = undefined;
+    teardown = undefined;
   }
   const runFiles = () => {
     root.harness.bootstrapComplete = true;
@@ -589,7 +591,8 @@ function run(options = kEmptyObject) {
     });
   };
 
-  PromisePrototypeThen(PromisePrototypeThen(PromiseResolve(setup?.(root.reporter)), runFiles), postRun);
+  const setupPromise = PromiseResolve(setup?.(root.reporter));
+  PromisePrototypeThen(PromisePrototypeThen(PromisePrototypeThen(setupPromise, runFiles), postRun), teardown);
 
   return root.reporter;
 }

diff --git a/test/parallel/test-runner-run.mjs b/test/parallel/test-runner-run.mjs
@@ -551,3 +551,13 @@ describe('forceExit', () => {
     });
   });
 });
+
+
+// exitHandler doesn't run until after the tests / after hooks finish.
+process.on('exit', () => {
+  assert.strictEqual(process.listeners('uncaughtException').length, 0);
+  assert.strictEqual(process.listeners('unhandledRejection').length, 0);
+  assert.strictEqual(process.listeners('beforeExit').length, 0);
+  assert.strictEqual(process.listeners('SIGINT').length, 0);
+  assert.strictEqual(process.listeners('SIGTERM').length, 0);
+});