diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status index e7f8640d621c08..07fbc03ae3faec 100644 --- a/test/sequential/sequential.status +++ b/test/sequential/sequential.status @@ -9,8 +9,6 @@ prefix sequential test-cpu-prof-dir-worker: PASS, FLAKY [$system==win32] -# https://github.com/nodejs/node/issues/26401 -test-worker-prof: PASS, FLAKY [$system==linux] @@ -31,5 +29,3 @@ test-buffer-creation-regression: SKIP test-perf-hooks: SKIP [$arch==arm] -# https://github.com/nodejs/node/issues/26401#issuecomment-613095719 -test-worker-prof: PASS, FLAKY diff --git a/test/sequential/test-worker-prof.js b/test/sequential/test-worker-prof.js index f89ff962ff785d..c2df47a8e8a121 100644 --- a/test/sequential/test-worker-prof.js +++ b/test/sequential/test-worker-prof.js @@ -23,17 +23,17 @@ if (process.argv[2] === 'child') { const fs = require('fs'); const { Worker, parentPort } = require('worker_threads'); parentPort.on('message', (m) => { - if (counter++ === 10) + if (counter++ === 1024) process.exit(0); - parentPort.postMessage( - fs.readFileSync(m.toString()).slice(0, 1024 * 1024)); + parentPort.postMessage( + fs.readFileSync(m.toString()).slice(0, 1024 * 1024)); }); `; const { Worker } = require('worker_threads'); const w = new Worker(pingpong, { eval: true }); w.on('message', (m) => { - w.postMessage(process.execPath); + w.postMessage(__filename); }); w.on('exit', common.mustCall(() => { @@ -46,12 +46,13 @@ if (process.argv[2] === 'child') { } process.exit(0); })); - w.postMessage(process.execPath); + w.postMessage(__filename); } else { tmpdir.refresh(); + const timeout = common.platformTimeout(30_000); const spawnResult = spawnSync( process.execPath, ['--prof', __filename, 'child'], - { cwd: tmpdir.path, encoding: 'utf8', timeout: 30_000 }); + { cwd: tmpdir.path, encoding: 'utf8', timeout }); assert.strictEqual(spawnResult.stderr.toString(), '', `child exited with an error: \ ${util.inspect(spawnResult)}`); @@ -72,7 +73,7 @@ if (process.argv[2] === 'child') { // Test that at least 15 ticks have been recorded for both parent and child // threads. When not tracking Worker threads, only 1 or 2 ticks would // have been recorded. - // When running locally on x64 Linux, this number is usually at least 200 + // When running locally, this number is usually around 200 // for both threads, so 15 seems like a very safe threshold. assert(ticks >= 15, `${ticks} >= 15`); }