test: fix test-timeout-flag after revert of auto subtest wait

PR-URL: #58282
Fixes: #58227
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: LiviaMedeiros <[email protected]>

Author: pmarchini

test/fixtures/test-runner/output/test-timeout-flag.js

@@ -1,19 +1,39 @@
-// Flags: --test-timeout=20
 'use strict';
-const { describe, test } = require('node:test');
-const { setTimeout } = require('node:timers/promises');
+const { describe, it, after } = require('node:test');
+const { setTimeout } = require('node:timers');
+
+const timeoutRefs = [];
 
 describe('--test-timeout is set to 20ms', () => {
-  test('should timeout after 20ms', async () => {
-    await setTimeout(200000, undefined, { ref: false });
+  it('should timeout after 20ms', async () => {
+    const { promise, resolve } = Promise.withResolvers();
+    timeoutRefs.push(setTimeout(() => {
+      resolve();
+    }, 20000));
+    await promise;
   });
-  test('should timeout after 5ms', { timeout: 5 }, async () => {
-    await setTimeout(200000, undefined, { ref: false });
+
+  it('should timeout after 5ms', { timeout: 5 }, async () => {
+    const { promise, resolve } = Promise.withResolvers();
+    timeoutRefs.push(setTimeout(() => {
+      resolve();
+    }, 20000));
+    await promise;
   });
 
-  test('should not timeout', { timeout: 50000 }, async () => {
-    await setTimeout(1);
+  it('should not timeout', { timeout: 50000 }, async () => {
+    const { promise, resolve } = Promise.withResolvers();
+    timeoutRefs.push(setTimeout(() => {
+      resolve();
+    }, 1));
+    await promise;
   });
 
-  test('should pass', async () => {});
+  it('should pass', async () => {});
+
+  after(() => {
+    for (const timeoutRef of timeoutRefs) {
+      clearTimeout(timeoutRef);
+    }
+  });
 });

test/parallel/test-runner-output.mjs

@@ -134,12 +134,19 @@ const tests = [
   },
   {
     name: 'test-runner/output/test-timeout-flag.js',
-    flags: ['--test-reporter=tap'],
+    flags: [
+      '--test-reporter=tap',
+      '--test-timeout=20',
+    ],
   },
   // --test-timeout should work with or without --test flag
   {
     name: 'test-runner/output/test-timeout-flag.js',
-    flags: ['--test-reporter=tap', '--test'],
+    flags: [
+      '--test-reporter=tap',
+      '--test-timeout=20',
+      '--test',
+    ],
   },
   {
     name: 'test-runner/output/hooks-with-no-global-test.js',