Revert "test_runner: do not invoke after hook when test is empty" · nodejs/node@85aa6ca · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 636
• Pull requests 762
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 85aa6ca

Browse filesBrowse the repository at this point in the historyBrowse files

cjihrig

authored and

targos

committed

Revert "test_runner: do not invoke after hook when test is empty"

This reverts commit a53fd95. This caused a regression because the original issue this commit was attempting to fix is not a bug. The after() hook should always run. Fixes: #51997 PR-URL: #51998 Reviewed-By: Matthew Aitken <maitken033380023@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>

1 parent 7ff3551 commit 85aa6ca
Copy full SHA for 85aa6ca

2 files changed

+1-13Lines changed: 1 addition & 13 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal/test_runner
  • test.js
• test/parallel
  • test-runner-skip-after-hook.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/test_runner/test.js‎

Copy file name to clipboardExpand all lines: lib/internal/test_runner/test.js

+1-3Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -595,9 +595,7 @@ class Test extends AsyncResource {
595	595
596	596	const { args, ctx } = this.getRunArgs();
597	597	const after = async () => {
598		- // If its a root test then check for global after hook else check for parent after hook
599		- const check = this.parent ? this.parent.hooks.after.length > 0 : this.hooks.after.length > 0;
600		- if (check) {
	598	+ if (this.hooks.after.length > 0) {
601	599	await this.runHook('after', { __proto__: null, args, ctx });
602	600	}
603	601	};

Collapse file

‎test/parallel/test-runner-skip-after-hook.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-runner-skip-after-hook.js

-10Lines changed: 0 additions & 10 deletions

This file was deleted.

0 commit comments

Comments

0 (0)