test_runner: cleanup global event listeners after run · nodejs/node@367f9e7 · GitHub
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

3 files changed

Lines changed: 20 additions & 2 deletions

File tree

lib/internal/test_runner/harness.js

Lines changed: 6 additions & 1 deletion

lib/internal/test_runner/runner.js

Lines changed: 4 additions & 1 deletion
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

Lines changed: 10 additions & 0 deletions

0 commit comments

Comments
 (0)