Skip to content

test_runner: call abort on test finish #48827

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.

Sign up for GitHub

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

Merged
nodejs-github-bot merged 12 commits into from
Jul 21, 2023
Merged

test_runner: call abort on test finish #48827

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
21a9e6d
test_runner: call abort on test finish
rluvaton Jul 18, 2023
0ed4cb4
format
rluvaton Jul 18, 2023
c4710a8
format
rluvaton Jul 18, 2023
eeabcf5
do not recreate on each test
rluvaton Jul 18, 2023
f93f38e
cleanup
rluvaton Jul 18, 2023
5017fe5
cleanup
rluvaton Jul 18, 2023
58da4d2
cleanup
rluvaton Jul 18, 2023
f5f36b6
abort after all cleanup
rluvaton Jul 19, 2023
0c7c812
Update test/fixtures/test-runner/aborts/wait-for-abort-helper.js
rluvaton Jul 19, 2023
42f7308
Update lib/internal/test_runner/test.js
rluvaton Jul 20, 2023
976b24f
trigger ci
rluvaton Jul 20, 2023
e511f95
Revert "trigger ci"
rluvaton Jul 20, 2023
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
Prev Previous commit
Next Next commit
do not recreate on each test
  • Loading branch information
@rluvaton
rluvaton committed Jul 18, 2023
commit eeabcf55cad59ad699c76996b3e5befc3cca85ba
19 changes: 11 additions & 8 deletions lib/internal/test_runner/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,13 +586,21 @@ class Test extends AsyncResource {
return;
}

this.#abortController.abort();
// Do not run for hooks and root test as hooks instance are shared between tests suite so aborting them will
// abort cause them to not run for further tests.
if (this.parent !== null) {
this.#abortController.abort();
}

await afterEach();
await after();
this.pass();
} catch (err) {
this.#abortController.abort();
// Do not run for hooks and root test as hooks instance are shared between tests suite so aborting them will
// abort cause them to not run for further tests.
if (this.parent !== null) {
this.#abortController.abort();
}
try { await afterEach(); } catch { /* test is already failing, let's ignore the error */ }
try { await after(); } catch { /* Ignore error. */ }
if (isTestFailureError(err)) {
Expand Down Expand Up @@ -746,11 +754,6 @@ class Test extends AsyncResource {
this.parent.reportStarted();
this.reporter.start(this.nesting, kFilename, this.name);
}

recreateAbortController() {
this.#abortController = new AbortController();
this.signal = this.#abortController.signal;
}
}

class TestHook extends Test {
Expand All @@ -774,7 +777,7 @@ class TestHook extends Test {
}
postRun() {
// Need to recreate the abort controller because we abort each time in the end
super.recreateAbortController();
// super.recreateAbortController();
}
}

Expand Down