Commit 993d0044ec6 for nodejs
commit 993d0044ec6fc7baceb2c4b1efd05714b01d7092
Author: Filip Skokan <panva.ip@gmail.com>
Date: Thu Oct 1 08:16:26 2026 +0200
test: split process timeout report coverage
Move the blocked Worker case into its own test.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
Assisted-by: Codex
PR-URL: https://github.com/nodejs/node/pull/66428
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/test/report/test-report-process-timeout-worker.js b/test/report/test-report-process-timeout-worker.js
new file mode 100644
index 00000000000..a42e2513ccb
--- /dev/null
+++ b/test/report/test-report-process-timeout-worker.js
@@ -0,0 +1,57 @@
+'use strict';
+
+// Tests --report-on-process-timeout with a blocked Worker.
+
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+const { spawnSync } = require('child_process');
+const fixtures = require('../common/fixtures');
+const helper = require('../common/report');
+const tmpdir = require('../common/tmpdir');
+
+tmpdir.refresh();
+
+// A Worker thread that is blocked in a synchronous native call cannot
+// provide its part of the report. It is left out, so that the report is
+// completed before the process is forced to exit.
+// If the Worker thread was not blocked yet when the deadline expired, which
+// the fixture signals by creating a file, it is included in the report. Run
+// the fixture again with a longer timeout in that case.
+let child;
+let report;
+for (let timeout = common.platformTimeout(1000); ; timeout *= 2) {
+ // Child processes of a previous attempt may still be running, so use a
+ // different file for each attempt.
+ const marker = tmpdir.resolve(`blocked-worker.${timeout}.ready`);
+ child = spawnSync(process.execPath, [
+ `--process-timeout=${timeout}ms`,
+ '--report-on-process-timeout',
+ fixtures.path('process-timeout', 'blocked-worker.js'),
+ marker,
+ ], { cwd: tmpdir.path, encoding: 'utf8' });
+
+ const reports = helper.findReports(child.pid, tmpdir.path);
+ assert.strictEqual(reports.length, 1, child.stderr);
+ helper.validate(reports[0], [
+ ['header.event', 'Process timed out (--process-timeout)'],
+ ['header.trigger', 'ProcessTimeout'],
+ ]);
+ report = JSON.parse(fs.readFileSync(reports[0], 'utf8'));
+ if ((fs.existsSync(marker) && report.workers.length === 0) ||
+ timeout >= common.platformTimeout(16000)) {
+ break;
+ }
+}
+
+assert.strictEqual(child.signal, null);
+assert.strictEqual(child.status, 124, child.stderr);
+assert.match(child.stderr, /^ {4}Worker \(thread 1, name 'blocked'\)$/m);
+// The report is completed before the process is forced to exit, so the
+// message about that is printed on its own line.
+assert.match(child.stderr, new RegExp(
+ '^Writing Node\\.js report to file: report\\.\\S+\\.json\\r?\\n' +
+ 'Node\\.js report completed\\r?\\n' +
+ '\\(node:\\d+\\) The process did not finish exiting within 5000ms after ' +
+ '--process-timeout expired\\. Forcing exit\\.$', 'm'));
+assert.deepStrictEqual(report.workers, []);
diff --git a/test/report/test-report-process-timeout.js b/test/report/test-report-process-timeout.js
index 367ab9f5d45..2ff049443ae 100644
--- a/test/report/test-report-process-timeout.js
+++ b/test/report/test-report-process-timeout.js
@@ -6,7 +6,6 @@ const common = require('../common');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
-const fixtures = require('../common/fixtures');
const helper = require('../common/report');
const tmpdir = require('../common/tmpdir');
@@ -46,49 +45,3 @@ helper.validate(reports[0], [
const report = JSON.parse(fs.readFileSync(reports[0], 'utf8'));
assert.match(report.javascriptStack.stack[0], /^at spin \(\[eval\]:1:\d+\)$/);
-
-{
- // A Worker thread that is blocked in a synchronous native call cannot
- // provide its part of the report. It is left out, so that the report is
- // completed before the process is forced to exit.
- // If the Worker thread was not blocked yet when the deadline expired, which
- // the fixture signals by creating a file, it is included in the report. Run
- // the fixture again with a longer timeout in that case.
- let child;
- let report;
- for (let timeout = common.platformTimeout(1000); ; timeout *= 2) {
- // Child processes of a previous attempt may still be running, so use a
- // different file for each attempt.
- const marker = tmpdir.resolve(`blocked-worker.${timeout}.ready`);
- child = spawnSync(process.execPath, [
- `--process-timeout=${timeout}ms`,
- '--report-on-process-timeout',
- fixtures.path('process-timeout', 'blocked-worker.js'),
- marker,
- ], { cwd: tmpdir.path, encoding: 'utf8' });
-
- const reports = helper.findReports(child.pid, tmpdir.path);
- assert.strictEqual(reports.length, 1, child.stderr);
- helper.validate(reports[0], [
- ['header.event', 'Process timed out (--process-timeout)'],
- ['header.trigger', 'ProcessTimeout'],
- ]);
- report = JSON.parse(fs.readFileSync(reports[0], 'utf8'));
- if ((fs.existsSync(marker) && report.workers.length === 0) ||
- timeout >= common.platformTimeout(16000)) {
- break;
- }
- }
-
- assert.strictEqual(child.signal, null);
- assert.strictEqual(child.status, 124, child.stderr);
- assert.match(child.stderr, /^ {4}Worker \(thread 1, name 'blocked'\)$/m);
- // The report is completed before the process is forced to exit, so the
- // message about that is printed on its own line.
- assert.match(child.stderr, new RegExp(
- '^Writing Node\\.js report to file: report\\.\\S+\\.json\\r?\\n' +
- 'Node\\.js report completed\\r?\\n' +
- '\\(node:\\d+\\) The process did not finish exiting within 5000ms after ' +
- '--process-timeout expired\\. Forcing exit\\.$', 'm'));
- assert.deepStrictEqual(report.workers, []);
-}