From b42151ac8aa44c7a93dd72e9603f9ccbe22c672f Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Sat, 28 Oct 2023 17:45:49 +0530
Subject: [PATCH 1/8] test_runner, cli: add --test-timeout flag

---
 doc/api/cli.md                   | 9 +++++++++
 doc/node.1                       | 3 +++
 lib/internal/main/test_runner.js | 3 +++
 src/node_options.cc              | 3 +++
 src/node_options.h               | 1 +
 5 files changed, 19 insertions(+)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 5f29c497426db6..1bd4864b2d1bca 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1771,6 +1771,15 @@ node --test --test-shard=2/3
 node --test --test-shard=3/3
 ```
 
+### `--test-timeout`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+A number of milliseconds the test execution will fail after. If unspecified,
+subtests inherit this value from their parent. The default value is `Infinity`.
+
 ### `--throw-deprecation`
 
 <!-- YAML
diff --git a/doc/node.1 b/doc/node.1
index 48ac6dc82130c2..fe862dece6c1e7 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -438,6 +438,9 @@ option set.
 .
 .It Fl -test-shard
 Test suite shard to execute in a format of <index>/<total>.
+
+.It Fl -test-timeout
+A number of milliseconds the test execution will fail after.
 .
 .It Fl -throw-deprecation
 Throw errors for deprecations.
diff --git a/lib/internal/main/test_runner.js b/lib/internal/main/test_runner.js
index 7e6f3079a509a9..4f3f067cc74242 100644
--- a/lib/internal/main/test_runner.js
+++ b/lib/internal/main/test_runner.js
@@ -60,11 +60,14 @@ if (shardOption) {
   };
 }
 
+const timeout = getOptionValue('--test-timeout') || Infinity;
+
 const options = {
   concurrency,
   inspectPort,
   watch: getOptionValue('--watch'),
   setup: setupTestReporters,
+  timeout,
   shard,
 };
 debug('test runner configuration:', options);
diff --git a/src/node_options.cc b/src/node_options.cc
index 29cb7fc6b29b89..c67876221fd801 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -603,6 +603,9 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
   AddOption("--test-concurrency",
             "specify test runner concurrency",
             &EnvironmentOptions::test_runner_concurrency);
+  AddOption("--test-timeout",
+            "specify test runner timeout",
+            &EnvironmentOptions::test_runner_timeout);
   AddOption("--experimental-test-coverage",
             "enable code coverage in the test runner",
             &EnvironmentOptions::test_runner_coverage);
diff --git a/src/node_options.h b/src/node_options.h
index 30955c779714ce..58fcb23070ac41 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -161,6 +161,7 @@ class EnvironmentOptions : public Options {
   bool has_env_file_string = false;
   bool test_runner = false;
   uint64_t test_runner_concurrency = 0;
+  uint64_t test_runner_timeout = 0;
   bool test_runner_coverage = false;
   std::vector<std::string> test_name_pattern;
   std::vector<std::string> test_reporter;

From 566340b78fc66c5c598209f5e67e51d75d2cbfd7 Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Sat, 28 Oct 2023 18:24:25 +0530
Subject: [PATCH 2/8] Adding test for timeout

---
 test/fixtures/test-runner/timeout.js | 15 +++++++++++++++
 test/parallel/test-runner-cli.js     | 26 +++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 test/fixtures/test-runner/timeout.js

diff --git a/test/fixtures/test-runner/timeout.js b/test/fixtures/test-runner/timeout.js
new file mode 100644
index 00000000000000..7b758041f1cae9
--- /dev/null
+++ b/test/fixtures/test-runner/timeout.js
@@ -0,0 +1,15 @@
+'use strict';
+const test = require('node:test');
+const common = require('../../common');
+const fixtures = require('../../common/fixtures');
+
+test('should support timeout', async () => {
+  const stream = test.run({files: [
+    fixtures.path('test-runner', 'never_ending_sync.js'),
+    fixtures.path('test-runner', 'never_ending_async.js'),
+  ] });
+  stream.on('test:fail', common.mustCall(2));
+  stream.on('test:pass', common.mustNotCall());
+  // eslint-disable-next-line no-unused-vars
+  for await (const _ of stream);
+});
\ No newline at end of file
diff --git a/test/parallel/test-runner-cli.js b/test/parallel/test-runner-cli.js
index 34ce67caa5e6a5..2163cc3d3e37ab 100644
--- a/test/parallel/test-runner-cli.js
+++ b/test/parallel/test-runner-cli.js
@@ -115,6 +115,26 @@ const testFixtures = fixtures.path('test-runner');
   });
 }
 
+{
+  const args = [
+    '--test',
+    '--test-timeout',
+    50,
+    'test/fixtures/test-runner/timeout.js'
+  ];
+  const child = spawnSync(process.execPath, args);
+
+  assert.strictEqual(child.status, 1);
+  assert.strictEqual(child.signal, null);
+  assert.strictEqual(child.stderr.toString(), '');
+  const stdout = child.stdout.toString();
+  assert.match(stdout, /not ok 1 - test/);
+  assert.match(stdout, / {2}---/);
+  assert.match(stdout, / {2}duration_ms: .*/);
+  assert.match(stdout, /failureType: 'testTimeoutFailure/);
+  assert.match(stdout, /error: 'test timed out after 50ms'/);
+}
+
 {
   // Test combined stream outputs
   const args = [
@@ -195,9 +215,9 @@ const testFixtures = fixtures.path('test-runner');
   // Use test with --loader and --require.
   // This case is common since vscode uses --require to load the debugger.
   const args = ['--no-warnings',
-                '--experimental-loader', 'data:text/javascript,',
-                '--require', fixtures.path('empty.js'),
-                '--test', join(testFixtures, 'default-behavior', 'index.test.js')];
+    '--experimental-loader', 'data:text/javascript,',
+    '--require', fixtures.path('empty.js'),
+    '--test', join(testFixtures, 'default-behavior', 'index.test.js')];
   const child = spawnSync(process.execPath, args);
 
   assert.strictEqual(child.stderr.toString(), '');

From 5c6e2b83e5aebdbdeb8dd2fe0ee7038d9a1b3e87 Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Sat, 28 Oct 2023 18:50:12 +0530
Subject: [PATCH 3/8] lint fix

---
 test/parallel/test-runner-cli.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/parallel/test-runner-cli.js b/test/parallel/test-runner-cli.js
index 2163cc3d3e37ab..a64ce8f99131ba 100644
--- a/test/parallel/test-runner-cli.js
+++ b/test/parallel/test-runner-cli.js
@@ -120,7 +120,7 @@ const testFixtures = fixtures.path('test-runner');
     '--test',
     '--test-timeout',
     50,
-    'test/fixtures/test-runner/timeout.js'
+    'test/fixtures/test-runner/timeout.js',
   ];
   const child = spawnSync(process.execPath, args);
 
@@ -215,9 +215,9 @@ const testFixtures = fixtures.path('test-runner');
   // Use test with --loader and --require.
   // This case is common since vscode uses --require to load the debugger.
   const args = ['--no-warnings',
-    '--experimental-loader', 'data:text/javascript,',
-    '--require', fixtures.path('empty.js'),
-    '--test', join(testFixtures, 'default-behavior', 'index.test.js')];
+                '--experimental-loader', 'data:text/javascript,',
+                '--require', fixtures.path('empty.js'),
+                '--test', join(testFixtures, 'default-behavior', 'index.test.js')];
   const child = spawnSync(process.execPath, args);
 
   assert.strictEqual(child.stderr.toString(), '');

From bd202c7bd1c2dd9b764b61bc62eff6c344725fae Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Sun, 29 Oct 2023 05:59:02 +0530
Subject: [PATCH 4/8] Update test/fixtures/test-runner/timeout.js

Co-authored-by: Moshe Atlow <moshe@atlow.co.il>
---
 test/fixtures/test-runner/timeout.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/test-runner/timeout.js b/test/fixtures/test-runner/timeout.js
index 7b758041f1cae9..5efc6a6c22dd70 100644
--- a/test/fixtures/test-runner/timeout.js
+++ b/test/fixtures/test-runner/timeout.js
@@ -12,4 +12,4 @@ test('should support timeout', async () => {
   stream.on('test:pass', common.mustNotCall());
   // eslint-disable-next-line no-unused-vars
   for await (const _ of stream);
-});
\ No newline at end of file
+});

From 87c217b8f2c72716664c17c5dbcf936e218db84e Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Wed, 1 Nov 2023 08:52:53 +0530
Subject: [PATCH 5/8] adding signal for killing zombie process

---
 test/fixtures/test-runner/timeout.js | 13 ++++++++-----
 test/parallel/test-runner-cli.js     |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/fixtures/test-runner/timeout.js b/test/fixtures/test-runner/timeout.js
index 5efc6a6c22dd70..534da8dec21ae4 100644
--- a/test/fixtures/test-runner/timeout.js
+++ b/test/fixtures/test-runner/timeout.js
@@ -3,11 +3,14 @@ const test = require('node:test');
 const common = require('../../common');
 const fixtures = require('../../common/fixtures');
 
-test('should support timeout', async () => {
-  const stream = test.run({files: [
-    fixtures.path('test-runner', 'never_ending_sync.js'),
-    fixtures.path('test-runner', 'never_ending_async.js'),
-  ] });
+test('should support timeout', async ({ signal }) => {
+  const stream = test.run({
+    signal,
+    files: [
+      fixtures.path('test-runner', 'never_ending_sync.js'),
+      fixtures.path('test-runner', 'never_ending_async.js'),
+    ]
+  });
   stream.on('test:fail', common.mustCall(2));
   stream.on('test:pass', common.mustNotCall());
   // eslint-disable-next-line no-unused-vars
diff --git a/test/parallel/test-runner-cli.js b/test/parallel/test-runner-cli.js
index a64ce8f99131ba..97e151628126c6 100644
--- a/test/parallel/test-runner-cli.js
+++ b/test/parallel/test-runner-cli.js
@@ -116,6 +116,7 @@ const testFixtures = fixtures.path('test-runner');
 }
 
 {
+  // Test --test-timeout flag
   const args = [
     '--test',
     '--test-timeout',

From 31e5a533f08731bb13757781a1722d3d0f0ea139 Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Thu, 2 Nov 2023 13:26:23 +0530
Subject: [PATCH 6/8] Moving test to another file added timeout to spawn sync

---
 test/fixtures/test-runner/timeout.js     | 18 ------------------
 test/parallel/test-runner-cli-timeout.js | 20 ++++++++++++++++++++
 test/parallel/test-runner-cli.js         | 21 ---------------------
 3 files changed, 20 insertions(+), 39 deletions(-)
 delete mode 100644 test/fixtures/test-runner/timeout.js
 create mode 100644 test/parallel/test-runner-cli-timeout.js

diff --git a/test/fixtures/test-runner/timeout.js b/test/fixtures/test-runner/timeout.js
deleted file mode 100644
index 534da8dec21ae4..00000000000000
--- a/test/fixtures/test-runner/timeout.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-const test = require('node:test');
-const common = require('../../common');
-const fixtures = require('../../common/fixtures');
-
-test('should support timeout', async ({ signal }) => {
-  const stream = test.run({
-    signal,
-    files: [
-      fixtures.path('test-runner', 'never_ending_sync.js'),
-      fixtures.path('test-runner', 'never_ending_async.js'),
-    ]
-  });
-  stream.on('test:fail', common.mustCall(2));
-  stream.on('test:pass', common.mustNotCall());
-  // eslint-disable-next-line no-unused-vars
-  for await (const _ of stream);
-});
diff --git a/test/parallel/test-runner-cli-timeout.js b/test/parallel/test-runner-cli-timeout.js
new file mode 100644
index 00000000000000..ab7e65d5667d09
--- /dev/null
+++ b/test/parallel/test-runner-cli-timeout.js
@@ -0,0 +1,20 @@
+'use strict';
+require('../common');
+const assert = require('node:assert');
+const { spawnSync } = require('node:child_process');
+const { test } = require('node:test');
+
+test('test-timeout flag', () => {
+  const args = ['--test', '--test-timeout', 10, 'test/fixtures/test-runner/never_ending_sync.js'];
+  const child = spawnSync(process.execPath, args, { timeout: 100 });
+
+  assert.strictEqual(child.status, 1);
+  assert.strictEqual(child.signal, null);
+  assert.strictEqual(child.stderr.toString(), '');
+  const stdout = child.stdout.toString();
+  assert.match(stdout, /not ok 1 - test/);
+  assert.match(stdout, / {2}---/);
+  assert.match(stdout, / {2}duration_ms: .*/);
+  assert.match(stdout, /failureType: 'testTimeoutFailure/);
+  assert.match(stdout, /error: 'test timed out after 10ms'/);
+});
diff --git a/test/parallel/test-runner-cli.js b/test/parallel/test-runner-cli.js
index 97e151628126c6..34ce67caa5e6a5 100644
--- a/test/parallel/test-runner-cli.js
+++ b/test/parallel/test-runner-cli.js
@@ -115,27 +115,6 @@ const testFixtures = fixtures.path('test-runner');
   });
 }
 
-{
-  // Test --test-timeout flag
-  const args = [
-    '--test',
-    '--test-timeout',
-    50,
-    'test/fixtures/test-runner/timeout.js',
-  ];
-  const child = spawnSync(process.execPath, args);
-
-  assert.strictEqual(child.status, 1);
-  assert.strictEqual(child.signal, null);
-  assert.strictEqual(child.stderr.toString(), '');
-  const stdout = child.stdout.toString();
-  assert.match(stdout, /not ok 1 - test/);
-  assert.match(stdout, / {2}---/);
-  assert.match(stdout, / {2}duration_ms: .*/);
-  assert.match(stdout, /failureType: 'testTimeoutFailure/);
-  assert.match(stdout, /error: 'test timed out after 50ms'/);
-}
-
 {
   // Test combined stream outputs
   const args = [

From 53a158b4dfbec4ad4cf7d4fba91d0465c306909d Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Thu, 2 Nov 2023 16:54:38 +0530
Subject: [PATCH 7/8] timeout

---
 test/parallel/test-runner-cli-timeout.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-runner-cli-timeout.js b/test/parallel/test-runner-cli-timeout.js
index ab7e65d5667d09..c14addd5f4faad 100644
--- a/test/parallel/test-runner-cli-timeout.js
+++ b/test/parallel/test-runner-cli-timeout.js
@@ -6,7 +6,7 @@ const { test } = require('node:test');
 
 test('test-timeout flag', () => {
   const args = ['--test', '--test-timeout', 10, 'test/fixtures/test-runner/never_ending_sync.js'];
-  const child = spawnSync(process.execPath, args, { timeout: 100 });
+  const child = spawnSync(process.execPath, args, { timeout: 500 });
 
   assert.strictEqual(child.status, 1);
   assert.strictEqual(child.signal, null);

From 4eae273645e7c193ef017489b3087d1351746146 Mon Sep 17 00:00:00 2001
From: Shubham Pandey <shubham9411@gmail.com>
Date: Mon, 6 Nov 2023 22:47:18 +0530
Subject: [PATCH 8/8] test using runner config

---
 test/parallel/test-runner-cli-timeout.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/parallel/test-runner-cli-timeout.js b/test/parallel/test-runner-cli-timeout.js
index c14addd5f4faad..b8998d397fa12c 100644
--- a/test/parallel/test-runner-cli-timeout.js
+++ b/test/parallel/test-runner-cli-timeout.js
@@ -1,20 +1,20 @@
 'use strict';
 require('../common');
+const fixtures = require('../common/fixtures');
 const assert = require('node:assert');
 const { spawnSync } = require('node:child_process');
 const { test } = require('node:test');
+const cwd = fixtures.path('test-runner', 'default-behavior');
+const env = { ...process.env, 'NODE_DEBUG': 'test_runner' };
 
-test('test-timeout flag', () => {
-  const args = ['--test', '--test-timeout', 10, 'test/fixtures/test-runner/never_ending_sync.js'];
-  const child = spawnSync(process.execPath, args, { timeout: 500 });
+test('default timeout -- Infinity', async () => {
+  const args = ['--test'];
+  const cp = spawnSync(process.execPath, args, { cwd, env });
+  assert.match(cp.stderr.toString(), /timeout: Infinity,/);
+});
 
-  assert.strictEqual(child.status, 1);
-  assert.strictEqual(child.signal, null);
-  assert.strictEqual(child.stderr.toString(), '');
-  const stdout = child.stdout.toString();
-  assert.match(stdout, /not ok 1 - test/);
-  assert.match(stdout, / {2}---/);
-  assert.match(stdout, / {2}duration_ms: .*/);
-  assert.match(stdout, /failureType: 'testTimeoutFailure/);
-  assert.match(stdout, /error: 'test timed out after 10ms'/);
+test('timeout of 10ms', async () => {
+  const args = ['--test', '--test-timeout', 10];
+  const cp = spawnSync(process.execPath, args, { cwd, env });
+  assert.match(cp.stderr.toString(), /timeout: 10,/);
 });