Skip to content

Commit 367f9e7

Browse files
EddieAbbondanziomarco-ippolito
authored andcommitted
test_runner: cleanup global event listeners after run
PR-URL: #53878 Fixes: #53868 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2e69e5f commit 367f9e7

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

lib/internal/test_runner/harness.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,13 @@ function setup(root) {
170170
kCancelledByParent));
171171

172172
hook.disable();
173-
process.removeListener('unhandledRejection', rejectionHandler);
174173
process.removeListener('uncaughtException', exceptionHandler);
174+
process.removeListener('unhandledRejection', rejectionHandler);
175+
process.removeListener('beforeExit', exitHandler);
176+
if (globalOptions.isTestRunner) {
177+
process.removeListener('SIGINT', terminationHandler);
178+
process.removeListener('SIGTERM', terminationHandler);
179+
}
175180
};
176181

177182
const terminationHandler = () => {

lib/internal/test_runner/runner.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ function run(options) {
591591
}
592592

593593
let postRun = () => root.postRun();
594+
let teardown = () => root.harness.teardown();
594595
let filesWatcher;
595596
const opts = {
596597
__proto__: null,
@@ -604,6 +605,7 @@ function run(options) {
604605
if (watch) {
605606
filesWatcher = watchFiles(testFiles, opts);
606607
postRun = undefined;
608+
teardown = undefined;
607609
}
608610
const runFiles = () => {
609611
root.harness.bootstrapComplete = true;
@@ -615,7 +617,8 @@ function run(options) {
615617
});
616618
};
617619

618-
PromisePrototypeThen(PromisePrototypeThen(PromiseResolve(setup?.(root.reporter)), runFiles), postRun);
620+
const setupPromise = PromiseResolve(setup?.(root.reporter));
621+
PromisePrototypeThen(PromisePrototypeThen(PromisePrototypeThen(setupPromise, runFiles), postRun), teardown);
619622

620623
return root.reporter;
621624
}

test/parallel/test-runner-run.mjs

+10
Original file line numberDiff line numberDiff line change
@@ -542,3 +542,13 @@ describe('forceExit', () => {
542542
});
543543
});
544544
});
545+
546+
547+
// exitHandler doesn't run until after the tests / after hooks finish.
548+
process.on('exit', () => {
549+
assert.strictEqual(process.listeners('uncaughtException').length, 0);
550+
assert.strictEqual(process.listeners('unhandledRejection').length, 0);
551+
assert.strictEqual(process.listeners('beforeExit').length, 0);
552+
assert.strictEqual(process.listeners('SIGINT').length, 0);
553+
assert.strictEqual(process.listeners('SIGTERM').length, 0);
554+
});

0 commit comments

Comments
 (0)