test_runner: fix afterEach not running on test failures

nodejs · Oct 27, 2022 · 789b7ee · 789b7ee
1 parent a69a300
commit 789b7ee
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -481,8 +481,9 @@ class Test extends AsyncResource {
       return;
     }
 
+    const { args, ctx } = this.getRunArgs();
+
     try {
-      const { args, ctx } = this.getRunArgs();
       if (this.parent?.hooks.beforeEach.length > 0) {
         await this.parent[kRunHook]('beforeEach', { args, ctx });
       }
@@ -517,10 +518,6 @@ class Test extends AsyncResource {
         return;
       }
 
-      if (this.parent?.hooks.afterEach.length > 0) {
-        await this.parent[kRunHook]('afterEach', { args, ctx });
-      }
-
       this.pass();
     } catch (err) {
       if (isTestFailureError(err)) {
@@ -532,6 +529,12 @@ class Test extends AsyncResource {
       } else {
         this.fail(new ERR_TEST_FAILURE(err, kTestCodeFailure));
       }
+    } finally {
+      const afterEach = this.parent?.hooks?.afterEach || [];
+      const shouldRunAfterEach = afterEach.length > 0;
+      if (shouldRunAfterEach) {
+        await this.parent[kRunHook]('afterEach', { args, ctx });
+      }
     }
 
     // Clean up the test. Then, try to report the results and execute any