Commit d78337f0850 for nodejs
commit d78337f085069b76c673da16530bd6d555e3e285
Author: Junhwan Choi <devjunsday@gmail.com>
Date: Tue Sep 1 15:43:22 2026 +0900
test: use spawnSync helpers in cpu-prof tests
The cpu-prof tests hand-rolled a partial version of what
test/common/child_process already provides: log the child's stderr
when the status is non-zero, then assert the status. That manual
version never shows stdout, the signal, or the command that ran, so
a CI failure gives less information than the helper would.
Replace those blocks with spawnSyncAndExitWithoutError(). Every
existing expectation is preserved -- status 0 is still required, and
signal null is now checked as well, matching the helper defaults.
Only success-path blocks whose assertions map one-to-one onto the
helper defaults are converted.
Refs: https://github.com/nodejs/node/pull/65351
Refs: https://github.com/nodejs/node/pull/65552
Assisted-by: claude:opus-5
Signed-off-by: Junhwan Choi <devjunsday@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65694
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/test/sequential/test-cpu-prof-default.js b/test/sequential/test-cpu-prof-default.js
index efd929469a6..3096dfa9e9d 100644
--- a/test/sequential/test-cpu-prof-default.js
+++ b/test/sequential/test-cpu-prof-default.js
@@ -10,7 +10,7 @@ const fixtures = require('../common/fixtures');
common.skipIfInspectorDisabled();
const assert = require('assert');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -20,17 +20,13 @@ const {
{
tmpdir.refresh();
- const output = spawnSync(process.execPath, [
+ spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof',
fixtures.path('workload', 'fibonacci.js'),
], {
cwd: tmpdir.path,
env,
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
const profiles = getCpuProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
diff --git a/test/sequential/test-cpu-prof-dir-absolute.js b/test/sequential/test-cpu-prof-dir-absolute.js
index 1747ba3b1f1..ae087a05300 100644
--- a/test/sequential/test-cpu-prof-dir-absolute.js
+++ b/test/sequential/test-cpu-prof-dir-absolute.js
@@ -8,7 +8,7 @@ common.skipIfInspectorDisabled();
const assert = require('assert');
const fs = require('fs');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -22,7 +22,7 @@ const {
{
tmpdir.refresh();
const dir = tmpdir.resolve('prof');
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof',
'--cpu-prof-interval',
kCpuProfInterval,
@@ -33,10 +33,6 @@ const {
cwd: tmpdir.path,
env,
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
assert(fs.existsSync(dir));
const profiles = getCpuProfiles(dir);
assert.strictEqual(profiles.length, 1);
diff --git a/test/sequential/test-cpu-prof-dir-and-name.js b/test/sequential/test-cpu-prof-dir-and-name.js
index 17395e678f3..699893c2f7d 100644
--- a/test/sequential/test-cpu-prof-dir-and-name.js
+++ b/test/sequential/test-cpu-prof-dir-and-name.js
@@ -9,7 +9,7 @@ common.skipIfInspectorDisabled();
const assert = require('assert');
const fs = require('fs');
const path = require('path');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -23,7 +23,7 @@ const {
tmpdir.refresh();
const dir = tmpdir.resolve('prof');
const file = path.join(dir, 'test.cpuprofile');
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof',
'--cpu-prof-interval',
kCpuProfInterval,
@@ -36,10 +36,6 @@ const {
cwd: tmpdir.path,
env,
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
assert(fs.existsSync(dir));
const profiles = getCpuProfiles(dir);
assert.deepStrictEqual(profiles, [file]);
diff --git a/test/sequential/test-cpu-prof-dir-relative.js b/test/sequential/test-cpu-prof-dir-relative.js
index 89684ae1c24..7e860e4bc88 100644
--- a/test/sequential/test-cpu-prof-dir-relative.js
+++ b/test/sequential/test-cpu-prof-dir-relative.js
@@ -8,7 +8,7 @@ common.skipIfInspectorDisabled();
const assert = require('assert');
const fs = require('fs');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -21,7 +21,7 @@ const {
// relative --cpu-prof-dir
{
tmpdir.refresh();
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof',
'--cpu-prof-interval',
kCpuProfInterval,
@@ -32,10 +32,6 @@ const {
cwd: tmpdir.path,
env,
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
const dir = tmpdir.resolve('prof');
assert(fs.existsSync(dir));
const profiles = getCpuProfiles(dir);
diff --git a/test/sequential/test-cpu-prof-dir-worker.js b/test/sequential/test-cpu-prof-dir-worker.js
index dd827414c5f..30a2b3f4a4a 100644
--- a/test/sequential/test-cpu-prof-dir-worker.js
+++ b/test/sequential/test-cpu-prof-dir-worker.js
@@ -8,7 +8,7 @@ common.skipIfInspectorDisabled();
const assert = require('assert');
const fs = require('fs');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -21,7 +21,7 @@ const {
// --cpu-prof-dir with worker
{
tmpdir.refresh();
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof-interval',
kCpuProfInterval,
'--cpu-prof-dir',
@@ -32,10 +32,6 @@ const {
cwd: tmpdir.path,
env,
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
const dir = tmpdir.resolve('prof');
assert(fs.existsSync(dir));
const profiles = getCpuProfiles(dir);
diff --git a/test/sequential/test-cpu-prof-drained.js b/test/sequential/test-cpu-prof-drained.js
index d71255a6a75..b147360d714 100644
--- a/test/sequential/test-cpu-prof-drained.js
+++ b/test/sequential/test-cpu-prof-drained.js
@@ -9,7 +9,7 @@ const fixtures = require('../common/fixtures');
common.skipIfInspectorDisabled();
const assert = require('assert');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -21,7 +21,7 @@ const {
{
tmpdir.refresh();
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof',
'--cpu-prof-interval',
kCpuProfInterval,
@@ -30,10 +30,6 @@ const {
cwd: tmpdir.path,
env,
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
const profiles = getCpuProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'fibonacci.js');
diff --git a/test/sequential/test-cpu-prof-name.js b/test/sequential/test-cpu-prof-name.js
index f79c3af8eed..45cbb2d02a2 100644
--- a/test/sequential/test-cpu-prof-name.js
+++ b/test/sequential/test-cpu-prof-name.js
@@ -10,7 +10,7 @@ common.skipIfInspectorDisabled();
const assert = require('assert');
const fs = require('fs');
const path = require('path');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -24,7 +24,7 @@ const {
{
tmpdir.refresh();
const file = tmpdir.resolve('test.cpuprofile');
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof',
'--cpu-prof-interval',
kCpuProfInterval,
@@ -35,10 +35,6 @@ const {
cwd: tmpdir.path,
env,
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
const profiles = getCpuProfiles(tmpdir.path);
assert.deepStrictEqual(profiles, [file]);
verifyFrames(output, file, 'fibonacci.js');
@@ -51,7 +47,7 @@ const {
const profName = 'CPU.${pid}.cpuprofile';
const dir = tmpdir.path;
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--cpu-prof',
'--cpu-prof-interval',
kCpuProfInterval,
@@ -63,12 +59,6 @@ const {
env,
});
- if (output.status !== 0) {
- console.error(output.stderr.toString());
- }
-
- assert.strictEqual(output.status, 0);
-
const expectedFile = path.join(dir, `CPU.${output.pid}.cpuprofile`);
assert.ok(fs.existsSync(expectedFile), `Expected file ${expectedFile} not found.`);
diff --git a/test/sequential/test-cpu-prof-worker-argv.js b/test/sequential/test-cpu-prof-worker-argv.js
index 37af0b95b7e..82586b2dfcf 100644
--- a/test/sequential/test-cpu-prof-worker-argv.js
+++ b/test/sequential/test-cpu-prof-worker-argv.js
@@ -8,7 +8,7 @@ const fixtures = require('../common/fixtures');
common.skipIfInspectorDisabled();
const assert = require('assert');
-const { spawnSync } = require('child_process');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');
const {
@@ -19,7 +19,7 @@ const {
{
tmpdir.refresh();
- const output = spawnSync(process.execPath, [
+ const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'fibonacci-worker-argv.js'),
], {
cwd: tmpdir.path,
@@ -28,10 +28,6 @@ const {
CPU_PROF_INTERVAL: kCpuProfInterval,
},
});
- if (output.status !== 0) {
- console.log(output.stderr.toString());
- }
- assert.strictEqual(output.status, 0);
const profiles = getCpuProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'fibonacci.js');