test-runner: fix suite timeout

Author: MoLow

lib/internal/test_runner/test.js

@@ -1455,7 +1455,9 @@ class Suite extends Test {
   reportedType = 'suite';
   constructor(options) {
     super(options);
-    this.timeout = null;
+    if (options.timeout == null) {
+      this.timeout = null;
+    }
 
     if (this.config.testNamePatterns !== null &&
         this.config.testSkipPatterns !== null &&

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

@@ -37,3 +37,14 @@ describe('--test-timeout is set to 20ms', () => {
     }
   });
 });
+
+
+describe('should inherit timeout options to children', { timeout: 5 }, () => {
+  it('should timeout after 5ms', async () => {
+    const { promise, resolve } = Promise.withResolvers();
+    timeoutRefs.push(setTimeout(() => {
+      resolve();
+    }, 20000));
+    await promise;
+  });
+});

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

@@ -44,12 +44,33 @@ not ok 1 - --test-timeout is set to 20ms
   error: '2 subtests failed'
   code: 'ERR_TEST_FAILURE'
   ...
-1..1
-# tests 4
-# suites 1
+# Subtest: should inherit timeout options to children
+    # Subtest: should timeout after 5ms
+    not ok 1 - should timeout after 5ms
+      ---
+      duration_ms: *
+      type: 'test'
+      location: '/test/fixtures/test-runner/output/test-timeout-flag.js:(LINE):3'
+      failureType: 'cancelledByParent'
+      error: 'test did not finish before its parent and was cancelled'
+      code: 'ERR_TEST_FAILURE'
+      ...
+    1..1
+not ok 2 - should inherit timeout options to children
+  ---
+  duration_ms: *
+  type: 'suite'
+  location: '/test/fixtures/test-runner/output/test-timeout-flag.js:(LINE):1'
+  failureType: 'testTimeoutFailure'
+  error: 'test timed out after 5ms'
+  code: 'ERR_TEST_FAILURE'
+  ...
+1..2
+# tests 5
+# suites 2
 # pass 2
 # fail 0
-# cancelled 2
+# cancelled 3
 # skipped 0
 # todo 0
 # duration_ms *