CR

Author: MoLow

Diff for: doc/api/test.md

@@ -337,7 +337,7 @@ changes:
   * `only` {boolean} If truthy, and the test context is configured to run
     `only` tests, then this test will be run. Otherwise, the test is skipped.
     **Default:** `false`.
-  * `signal` {AbortSignal} allows aborting an in-progress test
+  * `signal` {AbortSignal} Allows aborting an in-progress test
   * `skip` {boolean|string} If truthy, the test is skipped. If a string is
     provided, that string is displayed in the test results as the reason for
     skipping the test. **Default:** `false`.
@@ -491,7 +491,7 @@ test('top level test', (t) => {
 added: REPLACEME
 -->
 
-this is an <AbortSignal> used to signal when the test has been aborted.
+* <AbortSignal> Can be used to abort test subtasks when the test has been aborted.
 
 ```js
 test('top level test', async (t) => {
@@ -605,7 +605,7 @@ exposed as part of the API.
 added: REPLACEME
 -->
 
-this is an <AbortSignal> used to signal when the test has been aborted.
+* <AbortSignal> Can be used to abort test subtasks when the test has been aborted.
 
 [TAP]: https://testanything.org/
 [`--test-only`]: cli.md#--test-only

Diff for: lib/internal/main/test_runner.js

@@ -3,6 +3,7 @@ const {
   ArrayFrom,
   ArrayPrototypeFilter,
   ArrayPrototypeIncludes,
+  ArrayPrototypeJoin,
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   ArrayPrototypeSort,
@@ -124,8 +125,8 @@ function runTestFile(path) {
         err = new ERR_TEST_FAILURE('test failed', kSubtestsFailed);
         err.exitCode = code;
         err.signal = signal;
-        err.stdout = stdout.join('');
-        err.stderr = stderr.join('');
+        err.stdout = ArrayPrototypeJoin(stdout, '');
+        err.stderr = ArrayPrototypeJoin(stderr, '');
         // The stack will not be useful since the failures came from tests
         // in a child process.
         err.stack = undefined;

Diff for: lib/internal/test_runner/test.js

@@ -5,11 +5,12 @@ const {
   ArrayPrototypeUnshift,
   FunctionPrototype,
   Number,
+  PromisePrototypeThen,
+  PromiseResolve,
   ReflectApply,
   SafeMap,
   SafePromiseAll,
   SafePromiseRace,
-  PromiseResolve,
   Symbol,
 } = primordials;
 const { AsyncResource } = require('async_hooks');
@@ -55,7 +56,7 @@ function stopTest(timeout, signal) {
   if (timeout === kDefaultTimeout) {
     return once(signal, 'abort');
   }
-  return setTimeout(timeout, null, { ref: false, signal }).then(() => {
+  return PromisePrototypeThen(setTimeout(timeout, null, { ref: false, signal }), () => {
     throw new ERR_TEST_FAILURE(
       `test timed out after ${timeout}ms`,
       kTestTimeoutFailure

Diff for: test/message/test_runner_abort.js

@@ -20,7 +20,7 @@ test('promise timeout signal', { signal: AbortSignal.timeout(1) }, async (t) =>
 });
 
 test('promise abort signal', { signal: AbortSignal.abort() }, async (t) => {
-  t.test('should not appear', () => {});
+  await t.test('should not appear', () => {});
 });
 
 test('callback timeout signal', { signal: AbortSignal.timeout(1) }, (t, done) => {
@@ -38,7 +38,7 @@ test('callback timeout signal', { signal: AbortSignal.timeout(1) }, (t, done) =>
 });
 
 test('callback abort signal', { signal: AbortSignal.abort() }, (t, done) => {
-  t.test('should not appear', () => {});
+  t.test('should not appear', done);
 });
 
 // AbortSignal.timeout(1) doesn't prevent process from closing

Diff for: test/message/test_runner_abort.out

@@ -246,4 +246,4 @@ not ok 4 - callback abort signal
 # cancelled 4
 # skipped 0
 # todo 0
-# duration_ms *
+# duration_ms *