Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-key-store-pkcs11.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ const {
verify,
} = require('crypto');
const tmpdir = require('../common/tmpdir');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

const { subtle } = globalThis.crypto;
const kData = Buffer.from(
Expand DownExpand Up@@ -65,15 +66,14 @@ function softhsmOptions() {

function runInChild() {
const { cwd, env } = softhsmOptions();
const child = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
`--openssl-config=${kOpenSSLConfig}`,
__filename,
], {
cwd,
env: { ...process.env, ...env, NODE_TEST_PKCS11_CHILD: '1' },
stdio: 'inherit',
});
assert.strictEqual(child.status, 0);
}

function privateKeyUrl(label) {
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-experimental-shared-value-conveyor.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { Worker, parentPort } = require('worker_threads');
const { spawnSyncAndAssert } = require('../common/child_process');

if (process.env.TEST_CHILD_PROCESS === '1') {
// Do not use isMainThread so that this test itself can be run inside a Worker.
Expand All@@ -29,10 +29,10 @@ if (process.env.TEST_CHILD_PROCESS === '1') {

const args = ['--harmony-struct', __filename];
const options = { env: { TEST_CHILD_PROCESS: '1', ...process.env } };
const child = spawnSync(process.execPath, args, options);

assert.strictEqual(child.stderr.toString().trim(), '');
assert.strictEqual(child.stdout.toString().trim(), '');
assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
spawnSyncAndAssert(process.execPath, args, options, {
stdout: '',
stderr: '',
trim: true
});
}
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-basic.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,18 +20,13 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
fixtures.path('workload', 'allocation.js'),
], {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
}
8 changes: 2 additions & 6 deletions test/parallel/test-heap-prof-exec-argv.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -20,7 +20,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
fixtures.path('workload', 'allocation-worker-argv.js'),
], {
cwd: tmpdir.path,
Expand All@@ -29,10 +29,6 @@ const {
HEAP_PROF_INTERVAL: '128'
}
});
if (output.status !== 0) {
console.log(output.stderr.toString());
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
9 changes: 2 additions & 7 deletions test/parallel/test-heap-prof-loop-drained.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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');

Expand All@@ -21,7 +21,7 @@ const {

{
tmpdir.refresh();
const output = spawnSync(process.execPath, [
const { child: output } = spawnSyncAndExitWithoutError(process.execPath, [
'--heap-prof',
'--heap-prof-interval',
kHeapProfInterval,
Expand All@@ -30,11 +30,6 @@ const {
cwd: tmpdir.path,
env
});
if (output.status !== 0) {
console.log(output.stderr.toString());
console.log(output);
}
assert.strictEqual(output.status, 0);
const profiles = getHeapProfiles(tmpdir.path);
assert.strictEqual(profiles.length, 1);
verifyFrames(output, profiles[0], 'runAllocation');
Expand Down
27 changes: 13 additions & 14 deletions test/parallel/test-inspect-address-in-use.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
const common = require('../common');
common.skipIfInspectorDisabled();

const { spawnSync } = require('child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { createServer } = require('http');
const assert = require('assert');
const tmpdir = require('../common/tmpdir');
Expand All@@ -25,19 +25,18 @@ function testOnServerListen(fn) {
function testChildProcess(getArgs, exitCode, options) {
testOnServerListen(common.mustCall((server) => {
const { port } = server.address();
const child = spawnSync(process.execPath, getArgs(port), options);
const stderr = child.stderr.toString().trim();
const stdout = child.stdout.toString().trim();
console.log('[STDERR]');
console.log(stderr);
console.log('[STDOUT]');
console.log(stdout);
const match = stderr.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
assert.strictEqual(child.status, exitCode);
spawnSyncAndExit(process.execPath, getArgs(port), options, {
status: exitCode,
signal: null,
trim: true,
stderr: function(str) {
const match = str.match(
/Starting inspector on 127\.0\.0\.1:(\d+) failed: address already in use/
);
assert.notStrictEqual(match, null);
assert.strictEqual(match[1], port + '');
},
});
}));
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-os-homedir-no-envvar.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const os = require('os');
const path = require('path');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');


if (process.argv[2] === 'child') {
Expand All@@ -22,9 +22,7 @@ if (process.argv[2] === 'child') {
else
delete process.env.HOME;

const child = cp.spawnSync(process.execPath, [__filename, 'child'], {
spawnSyncAndExitWithoutError(process.execPath, [__filename, 'child'], {
env: process.env
});

assert.strictEqual(child.status, 0);
}
10 changes: 5 additions & 5 deletions test/parallel/test-process-execpath.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ if (common.isWindows)
common.skip('symlinks are weird on windows');

const assert = require('assert');
const child_process = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const fs = require('fs');

assert.strictEqual(process.execPath, fs.realpathSync(process.execPath));
Expand All@@ -19,8 +19,8 @@ if (process.argv[2] === 'child') {
const symlinkedNode = tmpdir.resolve('symlinked-node');
fs.symlinkSync(process.execPath, symlinkedNode);

const proc = child_process.spawnSync(symlinkedNode, [__filename, 'child']);
assert.strictEqual(proc.stderr.toString(), '');
assert.strictEqual(proc.stdout.toString(), `${process.execPath}\n`);
assert.strictEqual(proc.status, 0);
spawnSyncAndAssert(symlinkedNode, [__filename, 'child'], {
stdout: `${process.execPath}\n`,
stderr: ''
});
}
6 changes: 2 additions & 4 deletions test/parallel/test-runner-mock-timers-with-timeout.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
'use strict';
require('../common');
const fixtures = require('../common/fixtures');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { test } = require('node:test');

test('mock timers do not break test timeout cleanup', async () => {
const fixture = fixtures.path('test-runner', 'mock-timers-with-timeout.js');
const cp = spawnSync(process.execPath, ['--test', fixture], {
spawnSyncAndExitWithoutError(process.execPath, ['--test', fixture], {
timeout: 30_000,
});
assert.strictEqual(cp.status, 0, `Test failed:\nstdout: ${cp.stdout}\nstderr: ${cp.stderr}`);
});
7 changes: 3 additions & 4 deletions test/parallel/test-v8-stop-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 20;

{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'stop-coverage'),
'-r',
Expand All@@ -27,8 +27,7 @@ const intervals = 20;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage-noop.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

Expand All@@ -14,7 +14,7 @@ tmpdir.refresh();
// v8.takeCoverage() should be a noop if NODE_V8_COVERAGE is not set.
const intervals = 40;
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);
assert.strictEqual(coverageFiles.length, 0);
}
7 changes: 3 additions & 4 deletions test/parallel/test-v8-take-coverage.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,15 @@ const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

common.skipIfInspectorDisabled();

tmpdir.refresh();
const intervals = 40;
// Outputs coverage when v8.takeCoverage() is invoked.
{
const output = spawnSync(process.execPath, [
const { child } = spawnSyncAndExitWithoutError(process.execPath, [
'-r',
fixtures.path('v8-coverage', 'take-coverage'),
fixtures.path('v8-coverage', 'interval'),
Expand All@@ -25,8 +25,7 @@ const intervals = 40;
TEST_INTERVALS: intervals
},
});
console.log(output.stderr.toString());
assert.strictEqual(output.status, 0);
console.log(child.stderr.toString());
const coverageFiles = fs.readdirSync(tmpdir.path);

let coverages = [];
Expand Down
Loading