Skip to content

Commit

Permalink
test_runner: run t.after() if test body throws
Browse files Browse the repository at this point in the history
This commit fixes a bug where t.after() was not called if the
test body threw an exception.

PR-URL: nodejs#45870
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
cjihrig authored and MoLow committed Jan 26, 2023
1 parent 721c850 commit 5dc4643
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
8 changes: 7 additions & 1 deletion lib/internal/test_runner/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,11 @@ class Test extends AsyncResource {
}

const { args, ctx } = this.getRunArgs();
const after = runOnce(async () => {
if (this.hooks.after.length > 0) {
await this.runHook('after', { args, ctx });
}
});
const afterEach = runOnce(async () => {
if (this.parent?.hooks.afterEach.length > 0) {
await this.parent.runHook('afterEach', { args, ctx });
Expand Down Expand Up @@ -549,10 +554,11 @@ class Test extends AsyncResource {
return;
}

await this.runHook('after', { args, ctx });
await after();
await afterEach();
this.pass();
} catch (err) {
try { await after(); } catch { /* Ignore error. */ }
try { await afterEach(); } catch { /* test is already failing, let's the error */ }
if (isTestFailureError(err)) {
if (err.failureType === kTestTimeoutFailure) {
Expand Down
7 changes: 7 additions & 0 deletions test/message/test_runner_hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,10 @@ test('afterEach throws and test fails', async (t) => {
await t.test('1', () => { throw new Error('test'); });
await t.test('2', () => {});
});

test('t.after() is called if test body throws', (t) => {
t.after(() => {
t.diagnostic('- after() called');
});
throw new Error('bye');
});
24 changes: 21 additions & 3 deletions test/message/test_runner_hooks.out
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,28 @@ not ok 12 - afterEach throws and test fails
error: '2 subtests failed'
code: 'ERR_TEST_FAILURE'
...
1..12
# tests 12
# Subtest: t.after() is called if test body throws
not ok 13 - t.after() is called if test body throws
---
duration_ms: *
failureType: 'testCodeFailure'
error: 'bye'
code: 'ERR_TEST_FAILURE'
stack: |-
*
*
*
*
*
*
*
*
...
# - after() called
1..13
# tests 13
# pass 2
# fail 10
# fail 11
# cancelled 0
# skipped 0
# todo 0
Expand Down

0 comments on commit 5dc4643

Please sign in to comment.