Skip to content

Commit

Permalink
test_runner: refactor Promise chain in run()
Browse files Browse the repository at this point in the history
This commit refactors the chain of functions in run() to use an
async function instead of creating an awkward primordial-based
Promise chain.
  • Loading branch information
cjihrig committed Nov 22, 2024
1 parent 06085bd commit 1b298a1
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions lib/internal/test_runner/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const {
ArrayPrototypeSort,
ObjectAssign,
PromisePrototypeThen,
PromiseResolve,
PromiseWithResolvers,
SafeMap,
SafePromiseAll,
Expand Down Expand Up @@ -801,9 +800,23 @@ function run(options = kEmptyObject) {
}
}

const setupPromise = PromiseResolve(setup?.(root.reporter));
PromisePrototypeThen(PromisePrototypeThen(PromisePrototypeThen(setupPromise, runFiles), postRun), teardown);
const runChain = async () => {
if (typeof setup === 'function') {
await setup(root.reporter);
}

await runFiles();

if (typeof postRun === 'function') {
postRun();
}

if (typeof teardown === 'function') {
teardown();
}
};

runChain();
return root.reporter;
}

Expand Down

0 comments on commit 1b298a1

Please sign in to comment.