test_runner: fix reconstruction of errors extracted from YAML

MoLow · danielleadams · commit 524eaf5488c1 · 2023-04-10T22:18:20.000-04:00
PR-URL: #46872 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Nitzan Uziely <linkgoron@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/internal/test_runner/reporter/tap.js b/lib/internal/test_runner/reporter/tap.js
@@ -195,8 +195,10 @@ function jsToYaml(indent, name, value) {
       actual,
       operator,
       stack,
+      name,
     } = value;
     let errMsg = message ?? '<unknown error>';
+    let errName = name;
     let errStack = stack;
     let errCode = code;
     let errExpected = expected;
@@ -209,6 +211,7 @@ function jsToYaml(indent, name, value) {
     if (code === 'ERR_TEST_FAILURE' && kUnwrapErrors.has(failureType)) {
       errStack = cause?.stack ?? errStack;
       errCode = cause?.code ?? errCode;
+      errName = cause?.name ?? errName;
       if (isAssertionLike(cause)) {
         errExpected = cause.expected;
         errActual = cause.actual;
@@ -225,6 +228,9 @@ function jsToYaml(indent, name, value) {
     if (errCode) {
       result += jsToYaml(indent, 'code', errCode);
     }
+    if (errName && errName !== 'Error') {
+      result += jsToYaml(indent, 'name', errName);
+    }
 
     if (errIsAssertion) {
       result += jsToYaml(indent, 'expected', errExpected);
diff --git a/lib/internal/test_runner/yaml_to_js.js b/lib/internal/test_runner/yaml_to_js.js
@@ -42,9 +42,13 @@ function reConstructError(parsedYaml) {
   } else {
     // eslint-disable-next-line no-restricted-syntax
     cause = new Error(parsedYaml.error);
+  }
+  const name = parsedYaml.name ?? 'Error';
+  cause.stack = `${name}: ${parsedYaml.error}\n${stack}`;
+
+  if (!isAssertionError && !isTestFailure) {
     cause.code = parsedYaml.code;
   }
-  cause.stack = stack;
 
   if (isTestFailure) {
     error = new ERR_TEST_FAILURE(cause, parsedYaml.failureType);
diff --git a/test/message/test_runner_abort.out b/test/message/test_runner_abort.out
@@ -43,6 +43,7 @@ TAP version 13
       failureType: 'testAborted'
       error: 'This operation was aborted'
       code: 20
+      name: 'AbortError'
       stack: |-
         *
         *
@@ -62,6 +63,7 @@ TAP version 13
       failureType: 'testAborted'
       error: 'This operation was aborted'
       code: 20
+      name: 'AbortError'
       stack: |-
         *
         *
@@ -81,6 +83,7 @@ TAP version 13
       failureType: 'testAborted'
       error: 'This operation was aborted'
       code: 20
+      name: 'AbortError'
       stack: |-
         *
         *
@@ -100,6 +103,7 @@ not ok 1 - promise timeout signal
   failureType: 'testAborted'
   error: 'The operation was aborted due to timeout'
   code: 23
+  name: 'TimeoutError'
   stack: |-
     *
     *
@@ -113,6 +117,7 @@ not ok 2 - promise abort signal
   failureType: 'testAborted'
   error: 'This operation was aborted'
   code: 20
+  name: 'AbortError'
   stack: |-
     *
     *
@@ -168,6 +173,7 @@ not ok 2 - promise abort signal
       failureType: 'testAborted'
       error: 'This operation was aborted'
       code: 20
+      name: 'AbortError'
       stack: |-
         *
         *
@@ -187,6 +193,7 @@ not ok 2 - promise abort signal
       failureType: 'testAborted'
       error: 'This operation was aborted'
       code: 20
+      name: 'AbortError'
       stack: |-
         *
         *
@@ -206,6 +213,7 @@ not ok 2 - promise abort signal
       failureType: 'testAborted'
       error: 'This operation was aborted'
       code: 20
+      name: 'AbortError'
       stack: |-
         *
         *
@@ -225,6 +233,7 @@ not ok 3 - callback timeout signal
   failureType: 'testAborted'
   error: 'The operation was aborted due to timeout'
   code: 23
+  name: 'TimeoutError'
   stack: |-
     *
     *
@@ -238,6 +247,7 @@ not ok 4 - callback abort signal
   failureType: 'testAborted'
   error: 'This operation was aborted'
   code: 20
+  name: 'AbortError'
   stack: |-
     *
     *
diff --git a/test/message/test_runner_abort_suite.out b/test/message/test_runner_abort_suite.out
@@ -67,6 +67,7 @@ not ok 1 - describe timeout signal
   failureType: 'testAborted'
   error: 'The operation was aborted due to timeout'
   code: 23
+  name: 'TimeoutError'
   stack: |-
     *
     *
@@ -80,6 +81,7 @@ not ok 2 - describe abort signal
   failureType: 'testAborted'
   error: 'This operation was aborted'
   code: 20
+  name: 'AbortError'
   stack: |-
     *
     *
diff --git a/test/message/test_runner_describe_it.out b/test/message/test_runner_describe_it.out
@@ -122,6 +122,7 @@ not ok 14 - async assertion fail
     true !== false
     
   code: 'ERR_ASSERTION'
+  name: 'AssertionError'
   expected: false
   actual: true
   operator: 'strictEqual'
diff --git a/test/message/test_runner_output.out b/test/message/test_runner_output.out
@@ -126,6 +126,7 @@ not ok 13 - async assertion fail
     true !== false
 
   code: 'ERR_ASSERTION'
+  name: 'AssertionError'
   expected: false
   actual: true
   operator: 'strictEqual'
diff --git a/test/message/test_runner_output_cli.out b/test/message/test_runner_output_cli.out
@@ -126,6 +126,7 @@ not ok 13 - async assertion fail
     true !== false
 
   code: 'ERR_ASSERTION'
+  name: 'AssertionError'
   expected: false
   actual: true
   operator: 'strictEqual'

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ TAP version 13`
`43`	`43`	`failureType: 'testAborted'`
`44`	`44`	`error: 'This operation was aborted'`
`45`	`45`	`code: 20`
	`46`	`+ name: 'AbortError'`
`46`	`47`	`stack: \|-`
`47`	`48`	`*`
`48`	`49`	`*`
`@@ -62,6 +63,7 @@ TAP version 13`
`62`	`63`	`failureType: 'testAborted'`
`63`	`64`	`error: 'This operation was aborted'`
`64`	`65`	`code: 20`
	`66`	`+ name: 'AbortError'`
`65`	`67`	`stack: \|-`
`66`	`68`	`*`
`67`	`69`	`*`
`@@ -81,6 +83,7 @@ TAP version 13`
`81`	`83`	`failureType: 'testAborted'`
`82`	`84`	`error: 'This operation was aborted'`
`83`	`85`	`code: 20`
	`86`	`+ name: 'AbortError'`
`84`	`87`	`stack: \|-`
`85`	`88`	`*`
`86`	`89`	`*`
`@@ -100,6 +103,7 @@ not ok 1 - promise timeout signal`
`100`	`103`	`failureType: 'testAborted'`
`101`	`104`	`error: 'The operation was aborted due to timeout'`
`102`	`105`	`code: 23`
	`106`	`+ name: 'TimeoutError'`
`103`	`107`	`stack: \|-`
`104`	`108`	`*`
`105`	`109`	`*`
`@@ -113,6 +117,7 @@ not ok 2 - promise abort signal`
`113`	`117`	`failureType: 'testAborted'`
`114`	`118`	`error: 'This operation was aborted'`
`115`	`119`	`code: 20`
	`120`	`+ name: 'AbortError'`
`116`	`121`	`stack: \|-`
`117`	`122`	`*`
`118`	`123`	`*`
`@@ -168,6 +173,7 @@ not ok 2 - promise abort signal`
`168`	`173`	`failureType: 'testAborted'`
`169`	`174`	`error: 'This operation was aborted'`
`170`	`175`	`code: 20`
	`176`	`+ name: 'AbortError'`
`171`	`177`	`stack: \|-`
`172`	`178`	`*`
`173`	`179`	`*`
`@@ -187,6 +193,7 @@ not ok 2 - promise abort signal`
`187`	`193`	`failureType: 'testAborted'`
`188`	`194`	`error: 'This operation was aborted'`
`189`	`195`	`code: 20`
	`196`	`+ name: 'AbortError'`
`190`	`197`	`stack: \|-`
`191`	`198`	`*`
`192`	`199`	`*`
`@@ -206,6 +213,7 @@ not ok 2 - promise abort signal`
`206`	`213`	`failureType: 'testAborted'`
`207`	`214`	`error: 'This operation was aborted'`
`208`	`215`	`code: 20`
	`216`	`+ name: 'AbortError'`
`209`	`217`	`stack: \|-`
`210`	`218`	`*`
`211`	`219`	`*`
`@@ -225,6 +233,7 @@ not ok 3 - callback timeout signal`
`225`	`233`	`failureType: 'testAborted'`
`226`	`234`	`error: 'The operation was aborted due to timeout'`
`227`	`235`	`code: 23`
	`236`	`+ name: 'TimeoutError'`
`228`	`237`	`stack: \|-`
`229`	`238`	`*`
`230`	`239`	`*`
`@@ -238,6 +247,7 @@ not ok 4 - callback abort signal`
`238`	`247`	`failureType: 'testAborted'`
`239`	`248`	`error: 'This operation was aborted'`
`240`	`249`	`code: 20`
	`250`	`+ name: 'AbortError'`
`241`	`251`	`stack: \|-`
`242`	`252`	`*`
`243`	`253`	`*`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ not ok 1 - describe timeout signal`
`67`	`67`	`failureType: 'testAborted'`
`68`	`68`	`error: 'The operation was aborted due to timeout'`
`69`	`69`	`code: 23`
	`70`	`+ name: 'TimeoutError'`
`70`	`71`	`stack: \|-`
`71`	`72`	`*`
`72`	`73`	`*`
`@@ -80,6 +81,7 @@ not ok 2 - describe abort signal`
`80`	`81`	`failureType: 'testAborted'`
`81`	`82`	`error: 'This operation was aborted'`
`82`	`83`	`code: 20`
	`84`	`+ name: 'AbortError'`
`83`	`85`	`stack: \|-`
`84`	`86`	`*`
`85`	`87`	`*`