Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: fix more tests that fail when path contains a space #55088

Merged
merged 2 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
9 changes: 7 additions & 2 deletions test/parallel/test-child-process-execfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const os = require('os');

const fixture = fixtures.path('exit.js');
const echoFixture = fixtures.path('echo.js');
const execOpts = { encoding: 'utf8', shell: true };
const execOpts = { encoding: 'utf8', shell: true, env: { ...process.env, NODE: process.execPath, FIXTURE: fixture } };

{
execFile(
Expand Down Expand Up @@ -46,7 +46,12 @@ const execOpts = { encoding: 'utf8', shell: true };

{
// Verify the shell option works properly
execFile(process.execPath, [fixture, 0], execOpts, common.mustSucceed());
execFile(
`"${common.isWindows ? execOpts.env.NODE : '$NODE'}"`,
[`"${common.isWindows ? execOpts.env.FIXTURE : '$FIXTURE'}"`, 0],
execOpts,
common.mustSucceed()
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
);
}

{
Expand Down
6 changes: 4 additions & 2 deletions test/parallel/test-cli-node-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ if (process.config.variables.node_without_node_options)
// Test options specified by env variable.

const assert = require('assert');
const path = require('path');
const exec = require('child_process').execFile;
const { Worker } = require('worker_threads');

const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
tmpdir.refresh();

const printA = require.resolve('../fixtures/printA.js');
const printSpaceA = require.resolve('../fixtures/print A.js');
const printA = path.relative(tmpdir.path, fixtures.path('printA.js'));
const printSpaceA = path.relative(tmpdir.path, fixtures.path('print A.js'));

expectNoWorker(` -r ${printA} `, 'A\nB\n');
expectNoWorker(`-r ${printA}`, 'A\nB\n');
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-startup-large-pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const { spawnSync } = require('child_process');
[ '--use-largepages=xyzzy', '-p', '42' ]);
assert.strictEqual(child.status, 9);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString().match(/\S+/g).slice(1).join(' '),
'invalid value for --use-largepages');
assert.match(child.stderr.toString().trim(),
/invalid value for --use-largepages$/);
}

// TODO(gabrielschulhof): Make assertions about the stderr, which may or may not
Expand Down
4 changes: 2 additions & 2 deletions test/pseudo-tty/test-repl-external-module.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

require('../common');
const fixtures = require('../common/fixtures');
const { execSync } = require('child_process');
const { execFileSync } = require('child_process');

execSync(process.execPath, {
execFileSync(process.execPath, {
encoding: 'utf8',
stdio: 'inherit',
env: {
Expand Down
Loading