test_runner: fix test runner hooks failure stack

nodejs · Aug 18, 2022 · c886fc5 · c886fc5
1 parent a2dcc08
commit c886fc5
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 4 deletions.
diff --git a/lib/internal/test_runner/tap_stream.js b/lib/internal/test_runner/tap_stream.js
@@ -167,7 +167,7 @@ function jsToYaml(indent, name, value) {
   }
 
   if (isErrorObj) {
-    const { kTestCodeFailure } = lazyLoadTest();
+    const { kTestCodeFailure, kHookFailure } = lazyLoadTest();
     const {
       cause,
       code,
@@ -181,10 +181,12 @@ function jsToYaml(indent, name, value) {
 
     // If the ERR_TEST_FAILURE came from an error provided by user code,
     // then try to unwrap the original error message and stack.
-    if (code === 'ERR_TEST_FAILURE' && failureType === kTestCodeFailure) {
-      errMsg = cause?.message ?? errMsg;
+    if (code === 'ERR_TEST_FAILURE' && (failureType === kTestCodeFailure || failureType === kHookFailure)) {
       errStack = cause?.stack ?? errStack;
       errCode = cause?.code ?? errCode;
+      if (failureType === kTestCodeFailure) {
+        errMsg = cause?.message ?? errMsg;
+      }
     }
 
     result += jsToYaml(indent, 'error', errMsg);

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -691,4 +691,6 @@ class Suite extends Test {
   }
 }
 
-module.exports = { kCancelledByParent, kDefaultIndent, kSubtestsFailed, kTestCodeFailure, Test, Suite, ItTest };
+module.exports = {
+  kCancelledByParent, kDefaultIndent, kSubtestsFailed, kTestCodeFailure, kHookFailure, Test, Suite, ItTest,
+};
diff --git a/test/message/test_runner_hooks.out b/test/message/test_runner_hooks.out
@@ -55,6 +55,16 @@ not ok 2 - before throws
   failureType: 'hookFailed'
   error: 'failed running before hook'
   code: 'ERR_TEST_FAILURE'
+  stack: |-
+    Object.<anonymous> (*)
+    TestHook.runInAsyncScope (*)
+    TestHook.run (*)
+    TestHook.run (*)
+    *
+    *
+    *
+    *
+    *
   ...
 # Subtest: after throws
     # Subtest: 1
@@ -74,6 +84,16 @@ not ok 3 - after throws
   failureType: 'hookFailed'
   error: 'failed running after hook'
   code: 'ERR_TEST_FAILURE'
+  stack: |-
+    Object.<anonymous> (*)
+    TestHook.runInAsyncScope (*)
+    TestHook.run (*)
+    TestHook.run (*)
+    *
+    *
+    *
+    *
+    *
   ...
 # Subtest: beforeEach throws
     # Subtest: 1
@@ -84,6 +104,15 @@ not ok 3 - after throws
       error: 'failed running beforeEach hook'
       code: 'ERR_TEST_FAILURE'
       stack: |-
+        Object.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
         *
       ...
     # Subtest: 2
@@ -93,6 +122,17 @@ not ok 3 - after throws
       failureType: 'hookFailed'
       error: 'failed running beforeEach hook'
       code: 'ERR_TEST_FAILURE'
+      stack: |-
+        Object.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
+        *
       ...
     1..2
 not ok 4 - beforeEach throws
@@ -111,6 +151,15 @@ not ok 4 - beforeEach throws
       error: 'failed running afterEach hook'
       code: 'ERR_TEST_FAILURE'
       stack: |-
+        Object.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
         *
       ...
     # Subtest: 2
@@ -120,6 +169,17 @@ not ok 4 - beforeEach throws
       failureType: 'hookFailed'
       error: 'failed running afterEach hook'
       code: 'ERR_TEST_FAILURE'
+      stack: |-
+        Object.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
+        *
       ...
     1..2
 not ok 5 - afterEach throws
@@ -170,6 +230,15 @@ ok 6 - test hooks
       error: 'failed running beforeEach hook'
       code: 'ERR_TEST_FAILURE'
       stack: |-
+        TestContext.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
         *
       ...
     # Subtest: 2
@@ -180,6 +249,15 @@ ok 6 - test hooks
       error: 'failed running beforeEach hook'
       code: 'ERR_TEST_FAILURE'
       stack: |-
+        TestContext.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
         *
       ...
     1..2
@@ -199,6 +277,15 @@ not ok 7 - t.beforeEach throws
       error: 'failed running afterEach hook'
       code: 'ERR_TEST_FAILURE'
       stack: |-
+        TestContext.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
         *
       ...
     # Subtest: 2
@@ -209,6 +296,15 @@ not ok 7 - t.beforeEach throws
       error: 'failed running afterEach hook'
       code: 'ERR_TEST_FAILURE'
       stack: |-
+        TestContext.<anonymous> (*)
+        TestHook.runInAsyncScope (*)
+        TestHook.run (*)
+        TestHook.run (*)
+        *
+        *
+        *
+        *
+        *
         *
       ...
     1..2