Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
rluvaton committed Jul 29, 2023
1 parent 8bf321c commit 5f46f49
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions lib/internal/test_runner/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -511,26 +511,17 @@ class Test extends AsyncResource {

async runHook(hook, args) {
validateOneOf(hook, 'hook name', kHookNames);
let failedHook;
try {
await ArrayPrototypeReduce(this.hooks[hook], async (prev, hook) => {
await prev;
await hook.run(args);
if (hook.error) {
failedHook = hook;
throw hook.error;
}
}, PromiseResolve());
} catch (err) {
const error = new ERR_TEST_FAILURE(`failed running ${hook} hook`, kHookFailure);
error.cause = isTestFailureError(err) ? err.cause : err;
if (failedHook && !failedHook.outerSignal?.aborted) {
failedHook.passed = false;
failedHook.error = null;
failedHook.abortController.abort();
failedHook.abortController = new AbortController();
failedHook.signal = this.abortController.signal;
}
throw error;
}
}
Expand Down Expand Up @@ -771,6 +762,14 @@ class TestHook extends Test {
super({ __proto__: null, fn, timeout, signal });
}
run(args) {
if (this.error && !this.outerSignal?.aborted) {
this.passed = false;
this.error = null;
this.abortController.abort();
this.abortController = new AbortController();
this.signal = this.abortController.signal;
}

this.#args = args;
return super.run();
}
Expand Down

0 comments on commit 5f46f49

Please sign in to comment.