test_runner: simplify hook running logic

cjihrig · marco-ippolito · commit 7021b3b27604 · 2025-01-24T22:18:45.000+01:00
This commit removes some asynchronous logic from the runHook() method and replaces ArrayPrototypeReduce() with a for loop. PR-URL: #55963 Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -2,7 +2,6 @@
 const {
   ArrayPrototypePush,
   ArrayPrototypePushApply,
-  ArrayPrototypeReduce,
   ArrayPrototypeShift,
   ArrayPrototypeSlice,
   ArrayPrototypeSome,
@@ -718,13 +717,14 @@ class Test extends AsyncResource {
   async runHook(hook, args) {
     validateOneOf(hook, 'hook name', kHookNames);
     try {
-      await ArrayPrototypeReduce(this.hooks[hook], async (prev, hook) => {
-        await prev;
+      const hooks = this.hooks[hook];
+      for (let i = 0; i < hooks.length; ++i) {
+        const hook = hooks[i];
         await hook.run(args);
         if (hook.error) {
           throw hook.error;
         }
-      }, PromiseResolve());
+      }
     } catch (err) {
       const error = new ERR_TEST_FAILURE(`failed running ${hook} hook`, kHookFailure);
       error.cause = isTestFailureError(err) ? err.cause : err;
diff --git a/test/fixtures/test-runner/output/abort_hooks.snapshot b/test/fixtures/test-runner/output/abort_hooks.snapshot
@@ -101,7 +101,7 @@ not ok 2 - 2 after describe
         *
         *
         *
-        async Promise.all (index 0)
+        *
       ...
     # Subtest: test 2
     not ok 2 - test 2
@@ -122,7 +122,7 @@ not ok 2 - 2 after describe
         *
         *
         *
-        async Promise.all (index 0)
+        *
       ...
     1..2
 not ok 3 - 3 beforeEach describe
diff --git a/test/fixtures/test-runner/output/global_after_should_fail_the_test.snapshot b/test/fixtures/test-runner/output/global_after_should_fail_the_test.snapshot
@@ -21,7 +21,6 @@ not ok 2 - /test/fixtures/test-runner/output/global_after_should_fail_the_test.j
     *
     *
     *
-    *
   ...
 1..1
 # tests 1
diff --git a/test/fixtures/test-runner/output/hooks.snapshot b/test/fixtures/test-runner/output/hooks.snapshot
@@ -77,7 +77,6 @@ not ok 3 - before throws
     *
     *
     *
-    *
   ...
 # Subtest: before throws - no subtests
 not ok 4 - before throws - no subtests
@@ -97,7 +96,6 @@ not ok 4 - before throws - no subtests
     *
     *
     *
-    *
   ...
 # Subtest: after throws
     # Subtest: 1
@@ -129,6 +127,7 @@ not ok 5 - after throws
     *
     *
     *
+    *
   ...
 # Subtest: after throws - no subtests
 not ok 6 - after throws - no subtests
@@ -149,6 +148,7 @@ not ok 6 - after throws - no subtests
     *
     *
     *
+    *
   ...
 # Subtest: beforeEach throws
     # Subtest: 1
@@ -167,9 +167,9 @@ not ok 6 - after throws - no subtests
         *
         *
         *
-        async Promise.all (index 0)
         *
         *
+        new Promise (<anonymous>)
       ...
     # Subtest: 2
     not ok 2 - 2
@@ -188,6 +188,8 @@ not ok 6 - after throws - no subtests
         *
         *
         *
+        *
+        async Promise.all (index 0)
       ...
     1..2
 not ok 7 - beforeEach throws
@@ -482,7 +484,6 @@ not ok 15 - t.after throws
     *
     *
     *
-    *
   ...
 # Subtest: t.after throws - no subtests
 not ok 16 - t.after throws - no subtests
@@ -502,7 +503,6 @@ not ok 16 - t.after throws - no subtests
     *
     *
     *
-    *
   ...
 # Subtest: t.beforeEach throws
     # Subtest: 1
@@ -765,7 +765,6 @@ not ok 24 - run after when before throws
     *
     *
     *
-    *
   ...
 # Subtest: test hooks - async
     # Subtest: 1
diff --git a/test/fixtures/test-runner/output/hooks_spec_reporter.snapshot b/test/fixtures/test-runner/output/hooks_spec_reporter.snapshot
@@ -26,7 +26,6 @@
       *
       *
       *
-      *
 
  before throws - no subtests (*ms)
   Error: before
@@ -38,7 +37,6 @@
       *
       *
       *
-      *
 
  after throws
    1 (*ms)
@@ -55,6 +53,7 @@
       *
       *
       *
+      *
 
  after throws - no subtests (*ms)
   Error: after
@@ -67,6 +66,7 @@
       *
       *
       *
+      *
 
  beforeEach throws
    1 (*ms)
@@ -78,9 +78,9 @@
         *
         *
         *
-        at async Promise.all (index 0)
         *
         *
+        at new Promise (<anonymous>)
 
    2 (*ms)
     Error: beforeEach
@@ -92,6 +92,8 @@
         *
         *
         *
+        *
+        at async Promise.all (index 0)
 
  beforeEach throws (*ms)
  afterEach throws
@@ -242,7 +244,6 @@
       *
       *
       *
-      *
 
  t.after throws - no subtests (*ms)
   Error: after
@@ -255,7 +256,6 @@
       *
       *
       *
-      *
 
  t.beforeEach throws
    1 (*ms)
@@ -390,7 +390,6 @@
       *
       *
       *
-      *
 
  test hooks - async
    1 (*ms)
@@ -430,7 +429,6 @@
       *
       *
       *
-      *
 
 *
  before throws - no subtests (*ms)
@@ -443,7 +441,6 @@
       *
       *
       *
-      *
 
 *
  after throws (*ms)
@@ -457,6 +454,7 @@
       *
       *
       *
+      *
 
 *
  after throws - no subtests (*ms)
@@ -470,6 +468,7 @@
       *
       *
       *
+      *
 
 *
  1 (*ms)
@@ -481,9 +480,9 @@
       *
       *
       *
-      at async Promise.all (index 0)
       *
       *
+      at new Promise (<anonymous>)
 
 *
  2 (*ms)
@@ -496,6 +495,8 @@
       *
       *
       *
+      *
+      at async Promise.all (index 0)
 
 *
  1 (*ms)
@@ -633,7 +634,6 @@
       *
       *
       *
-      *
 
 *
  t.after throws - no subtests (*ms)
@@ -647,7 +647,6 @@
       *
       *
       *
-      *
 
 *
  1 (*ms)
@@ -776,4 +775,3 @@
       *
       *
       *
-      *

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ not ok 2 - 2 after describe`
`101`	`101`	`*`
`102`	`102`	`*`
`103`	`103`	`*`
`104`		`- async Promise.all (index 0)`
	`104`	`+ *`
`105`	`105`	`...`
`106`	`106`	`# Subtest: test 2`
`107`	`107`	`not ok 2 - test 2`
`@@ -122,7 +122,7 @@ not ok 2 - 2 after describe`
`122`	`122`	`*`
`123`	`123`	`*`
`124`	`124`	`*`
`125`		`- async Promise.all (index 0)`
	`125`	`+ *`
`126`	`126`	`...`
`127`	`127`	`1..2`
`128`	`128`	`not ok 3 - 3 beforeEach describe`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ not ok 2 - /test/fixtures/test-runner/output/global_after_should_fail_the_test.j`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`*`
`24`		`- *`
`25`	`24`	`...`
`26`	`25`	`1..1`
`27`	`26`	`# tests 1`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ not ok 3 - before throws`
`77`	`77`	`*`
`78`	`78`	`*`
`79`	`79`	`*`
`80`		`- *`
`81`	`80`	`...`
`82`	`81`	`# Subtest: before throws - no subtests`
`83`	`82`	`not ok 4 - before throws - no subtests`
`@@ -97,7 +96,6 @@ not ok 4 - before throws - no subtests`
`97`	`96`	`*`
`98`	`97`	`*`
`99`	`98`	`*`
`100`		`- *`
`101`	`99`	`...`
`102`	`100`	`# Subtest: after throws`
`103`	`101`	`# Subtest: 1`
`@@ -129,6 +127,7 @@ not ok 5 - after throws`
`129`	`127`	`*`
`130`	`128`	`*`
`131`	`129`	`*`
	`130`	`+ *`
`132`	`131`	`...`
`133`	`132`	`# Subtest: after throws - no subtests`
`134`	`133`	`not ok 6 - after throws - no subtests`
`@@ -149,6 +148,7 @@ not ok 6 - after throws - no subtests`
`149`	`148`	`*`
`150`	`149`	`*`
`151`	`150`	`*`
	`151`	`+ *`
`152`	`152`	`...`
`153`	`153`	`# Subtest: beforeEach throws`
`154`	`154`	`# Subtest: 1`
`@@ -167,9 +167,9 @@ not ok 6 - after throws - no subtests`
`167`	`167`	`*`
`168`	`168`	`*`
`169`	`169`	`*`
`170`		`- async Promise.all (index 0)`
`171`	`170`	`*`
`172`	`171`	`*`
	`172`	`+ new Promise (<anonymous>)`
`173`	`173`	`...`
`174`	`174`	`# Subtest: 2`
`175`	`175`	`not ok 2 - 2`
`@@ -188,6 +188,8 @@ not ok 6 - after throws - no subtests`
`188`	`188`	`*`
`189`	`189`	`*`
`190`	`190`	`*`
	`191`	`+ *`
	`192`	`+ async Promise.all (index 0)`
`191`	`193`	`...`
`192`	`194`	`1..2`
`193`	`195`	`not ok 7 - beforeEach throws`
`@@ -482,7 +484,6 @@ not ok 15 - t.after throws`
`482`	`484`	`*`
`483`	`485`	`*`
`484`	`486`	`*`
`485`		`- *`
`486`	`487`	`...`
`487`	`488`	`# Subtest: t.after throws - no subtests`
`488`	`489`	`not ok 16 - t.after throws - no subtests`
`@@ -502,7 +503,6 @@ not ok 16 - t.after throws - no subtests`
`502`	`503`	`*`
`503`	`504`	`*`
`504`	`505`	`*`
`505`		`- *`
`506`	`506`	`...`
`507`	`507`	`# Subtest: t.beforeEach throws`
`508`	`508`	`# Subtest: 1`
`@@ -765,7 +765,6 @@ not ok 24 - run after when before throws`
`765`	`765`	`*`
`766`	`766`	`*`
`767`	`767`	`*`
`768`		`- *`
`769`	`768`	`...`
`770`	`769`	`# Subtest: test hooks - async`
`771`	`770`	`# Subtest: 1`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`*`
`27`	`27`	`*`
`28`	`28`	`*`
`29`		`- *`
`30`	`29`
`31`	`30`	`before throws - no subtests (*ms)`
`32`	`31`	`Error: before`
`@@ -38,7 +37,6 @@`
`38`	`37`	`*`
`39`	`38`	`*`
`40`	`39`	`*`
`41`		`- *`
`42`	`40`
`43`	`41`	`after throws`
`44`	`42`	`1 (*ms)`
`@@ -55,6 +53,7 @@`
`55`	`53`	`*`
`56`	`54`	`*`
`57`	`55`	`*`
	`56`	`+ *`
`58`	`57`
`59`	`58`	`after throws - no subtests (*ms)`
`60`	`59`	`Error: after`
`@@ -67,6 +66,7 @@`
`67`	`66`	`*`
`68`	`67`	`*`
`69`	`68`	`*`
	`69`	`+ *`
`70`	`70`
`71`	`71`	`beforeEach throws`
`72`	`72`	`1 (*ms)`
`@@ -78,9 +78,9 @@`
`78`	`78`	`*`
`79`	`79`	`*`
`80`	`80`	`*`
`81`		`- at async Promise.all (index 0)`
`82`	`81`	`*`
`83`	`82`	`*`
	`83`	`+ at new Promise (<anonymous>)`
`84`	`84`
`85`	`85`	`2 (*ms)`
`86`	`86`	`Error: beforeEach`
`@@ -92,6 +92,8 @@`
`92`	`92`	`*`
`93`	`93`	`*`
`94`	`94`	`*`
	`95`	`+ *`
	`96`	`+ at async Promise.all (index 0)`
`95`	`97`
`96`	`98`	`beforeEach throws (*ms)`
`97`	`99`	`afterEach throws`
`@@ -242,7 +244,6 @@`
`242`	`244`	`*`
`243`	`245`	`*`
`244`	`246`	`*`
`245`		`- *`
`246`	`247`
`247`	`248`	`t.after throws - no subtests (*ms)`
`248`	`249`	`Error: after`
`@@ -255,7 +256,6 @@`
`255`	`256`	`*`
`256`	`257`	`*`
`257`	`258`	`*`
`258`		`- *`
`259`	`259`
`260`	`260`	`t.beforeEach throws`
`261`	`261`	`1 (*ms)`
`@@ -390,7 +390,6 @@`
`390`	`390`	`*`
`391`	`391`	`*`
`392`	`392`	`*`
`393`		`- *`
`394`	`393`
`395`	`394`	`test hooks - async`
`396`	`395`	`1 (*ms)`
`@@ -430,7 +429,6 @@`
`430`	`429`	`*`
`431`	`430`	`*`
`432`	`431`	`*`
`433`		`- *`
`434`	`432`
`435`	`433`	`*`
`436`	`434`	`before throws - no subtests (*ms)`
`@@ -443,7 +441,6 @@`
`443`	`441`	`*`
`444`	`442`	`*`
`445`	`443`	`*`
`446`		`- *`
`447`	`444`
`448`	`445`	`*`
`449`	`446`	`after throws (*ms)`
`@@ -457,6 +454,7 @@`
`457`	`454`	`*`
`458`	`455`	`*`
`459`	`456`	`*`
	`457`	`+ *`
`460`	`458`
`461`	`459`	`*`
`462`	`460`	`after throws - no subtests (*ms)`
`@@ -470,6 +468,7 @@`
`470`	`468`	`*`
`471`	`469`	`*`
`472`	`470`	`*`
	`471`	`+ *`
`473`	`472`
`474`	`473`	`*`
`475`	`474`	`1 (*ms)`
`@@ -481,9 +480,9 @@`
`481`	`480`	`*`
`482`	`481`	`*`
`483`	`482`	`*`
`484`		`- at async Promise.all (index 0)`
`485`	`483`	`*`
`486`	`484`	`*`
	`485`	`+ at new Promise (<anonymous>)`
`487`	`486`
`488`	`487`	`*`
`489`	`488`	`2 (*ms)`
`@@ -496,6 +495,8 @@`
`496`	`495`	`*`
`497`	`496`	`*`
`498`	`497`	`*`
	`498`	`+ *`
	`499`	`+ at async Promise.all (index 0)`
`499`	`500`
`500`	`501`	`*`
`501`	`502`	`1 (*ms)`
`@@ -633,7 +634,6 @@`
`633`	`634`	`*`
`634`	`635`	`*`
`635`	`636`	`*`
`636`		`- *`
`637`	`637`
`638`	`638`	`*`
`639`	`639`	`t.after throws - no subtests (*ms)`
`@@ -647,7 +647,6 @@`
`647`	`647`	`*`
`648`	`648`	`*`
`649`	`649`	`*`
`650`		`- *`
`651`	`650`
`652`	`651`	`*`
`653`	`652`	`1 (*ms)`
`@@ -776,4 +775,3 @@`
`776`	`775`	`*`
`777`	`776`	`*`
`778`	`777`	`*`
`779`		`- *`