From 89e8bf954e013500b6727785ee97c057342fb27e Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Mon, 12 Sep 2022 16:37:20 +0300
Subject: [PATCH] test_runner: include stack trace of `uncaughtException` and
 `unhandledRejection`

---
 lib/internal/test_runner/tap_stream.js   |  5 +++-
 test/message/test_runner_describe_it.out |  1 +
 test/message/test_runner_output.js       | 13 ++++++++++
 test/message/test_runner_output.out      | 33 +++++++++++++++++++++---
 4 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/lib/internal/test_runner/tap_stream.js b/lib/internal/test_runner/tap_stream.js
index 2d7b6e7b68eb15..094cccc5c4f1da 100644
--- a/lib/internal/test_runner/tap_stream.js
+++ b/lib/internal/test_runner/tap_stream.js
@@ -187,7 +187,10 @@ 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 || failureType === kHookFailure)) {
+    if (code === 'ERR_TEST_FAILURE' && (
+      failureType === kTestCodeFailure || failureType === kHookFailure ||
+      failureType === 'uncaughtException' || failureType === 'unhandledRejection'
+    )) {
       errStack = cause?.stack ?? errStack;
       errCode = cause?.code ?? errCode;
       if (failureType === kTestCodeFailure) {
diff --git a/test/message/test_runner_describe_it.out b/test/message/test_runner_describe_it.out
index cef7f8c94a8098..a1fa5fc1faaf04 100644
--- a/test/message/test_runner_describe_it.out
+++ b/test/message/test_runner_describe_it.out
@@ -418,6 +418,7 @@ not ok 49 - callback async throw
   code: 'ERR_TEST_FAILURE'
   stack: |-
     *
+    *
   ...
 # Subtest: callback async throw after done
 ok 50 - callback async throw after done
diff --git a/test/message/test_runner_output.js b/test/message/test_runner_output.js
index 8fce194f56d2b7..8695a4119aa313 100644
--- a/test/message/test_runner_output.js
+++ b/test/message/test_runner_output.js
@@ -371,3 +371,16 @@ test('rejected thenable', () => {
     },
   };
 });
+
+
+test('uncaughtException', async () => {
+  await new Promise(() => {
+    setTimeout(() => { throw new Error('foo'); });
+  });
+});
+
+test('unhandledRejection', async () => {
+  await new Promise(() => {
+    setTimeout(() => Promise.reject(new Error('bar')));
+  });
+});
\ No newline at end of file
diff --git a/test/message/test_runner_output.out b/test/message/test_runner_output.out
index 49a19fe302bbb0..677da5a6aff142 100644
--- a/test/message/test_runner_output.out
+++ b/test/message/test_runner_output.out
@@ -463,6 +463,7 @@ not ok 51 - callback async throw
   code: 'ERR_TEST_FAILURE'
   stack: |-
     *
+    *
   ...
 # Subtest: callback async throw after done
 ok 52 - callback async throw after done
@@ -601,8 +602,32 @@ not ok 62 - rejected thenable
   error: 'custom error'
   code: 'ERR_TEST_FAILURE'
   ...
+# Subtest: uncaughtException
+not ok 63 - uncaughtException
+  ---
+  duration_ms: *
+  failureType: 'uncaughtException'
+  error: 'foo'
+  code: 'ERR_TEST_FAILURE'
+  stack: |-
+    *
+    *
+    *
+  ...
+# Subtest: unhandledRejection
+not ok 64 - unhandledRejection
+  ---
+  duration_ms: *
+  failureType: 'unhandledRejection'
+  error: 'bar'
+  code: 'ERR_TEST_FAILURE'
+  stack: |-
+    *
+    *
+    *
+  ...
 # Subtest: invalid subtest fail
-not ok 63 - invalid subtest fail
+not ok 65 - invalid subtest fail
   ---
   duration_ms: *
   failureType: 'parentAlreadyFinished'
@@ -611,16 +636,16 @@ not ok 63 - invalid subtest fail
   stack: |-
     *
   ...
-1..63
+1..65
 # Warning: Test "unhandled rejection - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: rejected from unhandled rejection fail" and would have caused the test to fail, but instead triggered an unhandledRejection event.
 # Warning: Test "async unhandled rejection - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: rejected from async unhandled rejection fail" and would have caused the test to fail, but instead triggered an unhandledRejection event.
 # Warning: Test "immediate throw - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: thrown from immediate throw fail" and would have caused the test to fail, but instead triggered an uncaughtException event.
 # Warning: Test "immediate reject - passes but warns" generated asynchronous activity after the test ended. This activity created the error "Error: rejected from immediate reject fail" and would have caused the test to fail, but instead triggered an unhandledRejection event.
 # Warning: Test "callback called twice in different ticks" generated asynchronous activity after the test ended. This activity created the error "Error [ERR_TEST_FAILURE]: callback invoked multiple times" and would have caused the test to fail, but instead triggered an uncaughtException event.
 # Warning: Test "callback async throw after done" generated asynchronous activity after the test ended. This activity created the error "Error: thrown from callback async throw after done" and would have caused the test to fail, but instead triggered an uncaughtException event.
-# tests 63
+# tests 65
 # pass 27
-# fail 19
+# fail 21
 # cancelled 2
 # skipped 10
 # todo 5