test_runner: suite fixes

nodejs · Jul 8, 2022 · a32fe20 · a32fe20
1 parent 1523a18
commit a32fe20
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -1,12 +1,12 @@
 'use strict';
 const {
+  ArrayPrototypeMap,
   ArrayPrototypePush,
-  ArrayPrototypeReduce,
   ArrayPrototypeShift,
   ArrayPrototypeUnshift,
   FunctionPrototype,
   Number,
-  PromiseResolve,
+  PromiseAll,
   ReflectApply,
   SafeMap,
 } = primordials;
@@ -457,7 +457,11 @@ class Suite extends Test {
   constructor(options) {
     super(options);
 
-    this.runInAsyncScope(this.fn);
+    try {
+      this.runInAsyncScope(this.fn);
+    }  catch (err) {
+      this.fail(new ERR_TEST_FAILURE(err, kTestCodeFailure));
+    }
     this.fn = () => {};
     this.finished = true; // Forbid adding subtests to this suite
   }
@@ -469,11 +473,8 @@ class Suite extends Test {
   async run() {
     this.parent.activeSubtests++;
     this.startTime = hrtime();
-    const subtests = this.skipped ? [] : this.subtests;
-    await ArrayPrototypeReduce(subtests, async (prev, subtest) => {
-      await prev;
-      await subtest.run();
-    }, PromiseResolve());
+    const subtests = this.skipped || this.error ? [] : this.subtests;
+    await PromiseAll(ArrayPrototypeMap(subtests, subtests => subtests.start()));
     this.pass();
     this.postRun();
   }

diff --git a/test/message/test_runner_desctibe_it.out b/test/message/test_runner_desctibe_it.out
@@ -182,6 +182,10 @@ ok 19 - immediate resolve pass
         *
         *
         *
+        *
+        *
+        *
+        *
       ...
     1..1
 not ok 20 - subtest sync throw fail
@@ -465,6 +469,9 @@ not ok 52 - custom inspect symbol that throws fail
         *
         *
         *
+        *
+        *
+        *
       ...
     # Subtest: sync throw fails at second
     not ok 2 - sync throw fails at second
@@ -480,6 +487,10 @@ not ok 52 - custom inspect symbol that throws fail
         *
         *
         *
+        *
+        *
+        *
+        *
       ...
     1..2
 not ok 53 - subtest sync throw fails