fix: fix it concurrency

PR-URL: nodejs/node#43757 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Jacob Smith <[email protected]> (cherry picked from commit a3766bc8a84bcd375372a0a5c8c9174dadb6817d)
aduh95 · Jul 20, 2022 · 0a81cfc · 0a81cfc
1 parent 5b6851f
commit 0a81cfc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/lib/internal/per_context/primordials.js b/lib/internal/per_context/primordials.js
@@ -33,6 +33,7 @@ exports.PromiseResolve = val => Promise.resolve(val)
 exports.PromiseRace = val => Promise.race(val)
 exports.SafeArrayIterator = class ArrayIterator {constructor (array) { this.array = array }[Symbol.iterator] () { return this.array.values() }}
 exports.SafeMap = Map
+exports.SafePromiseAll = (array, mapFn) => Promise.all(array.map(mapFn))
 exports.SafeSet = Set
 exports.SafeWeakMap = WeakMap
 exports.StringPrototypeMatch = (str, reg) => str.match(reg)

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -4,15 +4,14 @@
 
 const {
   ArrayPrototypePush,
-  ArrayPrototypeReduce,
   ArrayPrototypeShift,
   ArrayPrototypeUnshift,
   FunctionPrototype,
   Number,
-  PromiseResolve,
   ReflectApply,
   SafeMap,
-  PromiseRace
+  PromiseRace,
+  SafePromiseAll
 } = require('#internal/per_context/primordials')
 const { AsyncResource } = require('async_hooks')
 const {
@@ -510,10 +509,7 @@ class Suite extends Test {
     this.parent.activeSubtests++
     this.startTime = hrtime()
     const subtests = this.skipped || this.error ? [] : this.subtests
-    await testTimeout(ArrayPrototypeReduce(subtests, async (prev, subtest) => {
-      await prev
-      await subtest.run()
-    }, PromiseResolve()), this.timeout)
+    await SafePromiseAll(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
@@ -188,6 +188,10 @@ ok 20 - immediate resolve pass
         *
         *
         *
+        *
+        *
+        *
+        *
       ...
     1..1
 not ok 21 - subtest sync throw fail
@@ -476,6 +480,9 @@ not ok 53 - custom inspect symbol that throws fail
         *
         *
         *
+        *
+        *
+        *
       ...
     # Subtest: sync throw fails at second
     not ok 2 - sync throw fails at second
@@ -491,6 +498,10 @@ not ok 53 - custom inspect symbol that throws fail
         *
         *
         *
+        *
+        *
+        *
+        *
       ...
     1..2
 not ok 54 - subtest sync throw fails
@@ -565,6 +576,8 @@ not ok 56 - describe async throw fails
       failureType: 'testTimeoutFailure'
       error: 'test timed out after 5ms'
       code: 'ERR_TEST_FAILURE'
+      stack: |-
+        *
       ...
     # Subtest: timed out callback test
     not ok 2 - timed out callback test