Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test_runner: run after hooks even if test is aborted #54151

Merged
merged 1 commit into from
Aug 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions lib/internal/test_runner/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -763,10 +763,7 @@ class Test extends AsyncResource {
}

[kShouldAbort]() {
if (this.signal.aborted) {
return true;
}
if (this.outerSignal?.aborted) {
if (this.signal.aborted || this.outerSignal?.aborted) {
this.#abortHandler();
return true;
}
Expand Down Expand Up @@ -866,10 +863,7 @@ class Test extends AsyncResource {
await SafePromiseRace([PromiseResolve(promise), stopPromise]);
}

if (this[kShouldAbort]()) {
this.postRun();
return;
}
this[kShouldAbort]();
this.plan?.check();
this.pass();
await afterEach();
Expand Down
14 changes: 14 additions & 0 deletions test/fixtures/test-runner/output/abort-runs-after-hook.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';
const { test } = require('node:test');

test('test that aborts', (t, done) => {
t.after(() => {
// This should still run.
console.log('AFTER');
});

setImmediate(() => {
// This creates an uncaughtException, which aborts the test.
throw new Error('boom');
});
});
23 changes: 23 additions & 0 deletions test/fixtures/test-runner/output/abort-runs-after-hook.snapshot
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
TAP version 13
AFTER
# Subtest: test that aborts
not ok 1 - test that aborts
---
duration_ms: *
location: '/test/fixtures/test-runner/output/abort-runs-after-hook.js:(LINE):1'
failureType: 'uncaughtException'
error: 'boom'
code: 'ERR_TEST_FAILURE'
stack: |-
*
*
...
1..1
# tests 1
# suites 0
# pass 0
# fail 1
# cancelled 0
# skipped 0
# todo 0
# duration_ms *
1 change: 1 addition & 0 deletions test/parallel/test-runner-output.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ const lcovTransform = snapshot.transform(

const tests = [
{ name: 'test-runner/output/abort.js' },
{ name: 'test-runner/output/abort-runs-after-hook.js' },
{ name: 'test-runner/output/abort_suite.js' },
{ name: 'test-runner/output/abort_hooks.js' },
{ name: 'test-runner/output/describe_it.js' },
Expand Down
Loading