Skip to content

Commit e87cb32

Browse files
gibfahnMylesBorins
gibfahn
authored and
MylesBorins
committed
test: remove envPlus, use Object.assign everywhere
PR-URL: #14845 Fixes: #14823 Refs: #14822 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent dea959e commit e87cb32

15 files changed

+38
-39
lines changed

‎test/parallel/test-benchmark-crypto.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ const argv = ['--set', 'algo=sha256',
2727
'--set', 'writes=1',
2828
'crypto'];
2929

30-
const env = Object.assign({}, process.env,
31-
{ NODEJS_BENCHMARK_ZERO_ALLOWED: 1 });
32-
const child = fork(runjs, argv, { env });
30+
const child = fork(runjs, argv, { env: Object.assign({}, process.env, {
31+
NODEJS_BENCHMARK_ZERO_ALLOWED: 1 }) });
32+
3333
child.on('exit', (code, signal) => {
3434
assert.strictEqual(code, 0);
3535
assert.strictEqual(signal, null);

‎test/parallel/test-child-process-env.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ Object.setPrototypeOf(env, {
3434

3535
let child;
3636
if (common.isWindows) {
37-
child = spawn('cmd.exe', ['/c', 'set'], {env: env});
37+
child = spawn('cmd.exe', ['/c', 'set'],
38+
Object.assign({}, process.env, { env: env }));
3839
} else {
39-
child = spawn('/usr/bin/env', [], {env: env});
40+
child = spawn('/usr/bin/env', [],
41+
Object.assign({}, process.env, { env: env }));
4042
}
4143

4244

‎test/parallel/test-child-process-exec-env.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ function after(err, stdout, stderr) {
4444
if (!common.isWindows) {
4545
child = exec('/usr/bin/env', { env: { 'HELLO': 'WORLD' } }, after);
4646
} else {
47-
child = exec('set', { env: { 'HELLO': 'WORLD' } }, after);
47+
child = exec('set',
48+
{ env: Object.assign({}, process.env, { 'HELLO': 'WORLD' }) },
49+
after);
4850
}
4951

5052
child.stdout.setEncoding('utf8');

‎test/parallel/test-cli-node-options.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ disallow('--');
2929
disallow('--no_warnings'); // Node options don't allow '_' instead of '-'.
3030

3131
function disallow(opt) {
32-
const options = {env: {NODE_OPTIONS: opt}};
32+
const options = { env: Object.assign({}, process.env,
33+
{ NODE_OPTIONS: opt }) };
3334
exec(process.execPath, options, common.mustCall(function(err) {
3435
const message = err.message.split(/\r?\n/)[1];
3536
const expect = `${process.execPath}: ${opt} is not allowed in NODE_OPTIONS`;
@@ -71,7 +72,7 @@ function expect(opt, want) {
7172
const printB = require.resolve('../fixtures/printB.js');
7273
const argv = [printB];
7374
const opts = {
74-
env: {NODE_OPTIONS: opt},
75+
env: Object.assign({}, process.env, { NODE_OPTIONS: opt }),
7576
maxBuffer: 1000000000,
7677
};
7778
exec(process.execPath, argv, opts, common.mustCall(function(err, stdout) {

‎test/parallel/test-crypto-fips.js‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,6 @@ function sharedOpenSSL() {
2626
return process.config.variables.node_shared_openssl;
2727
}
2828

29-
function addToEnv(newVar, value) {
30-
const envCopy = {};
31-
for (const e in process.env) {
32-
envCopy[e] = process.env[e];
33-
}
34-
envCopy[newVar] = value;
35-
return envCopy;
36-
}
37-
3829
function testHelper(stream, args, expectedOutput, cmd, env) {
3930
const fullArgs = args.concat(['-e', `console.log(${cmd})`]);
4031
const child = spawnSync(process.execPath, fullArgs, {
@@ -72,7 +63,7 @@ testHelper(
7263
[],
7364
FIPS_DISABLED,
7465
'require("crypto").fips',
75-
addToEnv('OPENSSL_CONF', ''));
66+
Object.assign({}, process.env, { 'OPENSSL_CONF': '' }));
7667

7768
// --enable-fips should turn FIPS mode on
7869
testHelper(
@@ -117,23 +108,23 @@ if (!sharedOpenSSL()) {
117108
[],
118109
compiledWithFips() ? FIPS_ENABLED : FIPS_DISABLED,
119110
'require("crypto").fips',
120-
addToEnv('OPENSSL_CONF', CNF_FIPS_ON));
111+
Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_ON }));
121112

122113
// --openssl-config option should override OPENSSL_CONF
123114
testHelper(
124115
'stdout',
125116
[`--openssl-config=${CNF_FIPS_ON}`],
126117
compiledWithFips() ? FIPS_ENABLED : FIPS_DISABLED,
127118
'require("crypto").fips',
128-
addToEnv('OPENSSL_CONF', CNF_FIPS_OFF));
119+
Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_OFF }));
129120
}
130121

131122
testHelper(
132123
'stdout',
133124
[`--openssl-config=${CNF_FIPS_OFF}`],
134125
FIPS_DISABLED,
135126
'require("crypto").fips',
136-
addToEnv('OPENSSL_CONF', CNF_FIPS_ON));
127+
Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_ON }));
137128

138129
// --enable-fips should take precedence over OpenSSL config file
139130
testHelper(
@@ -149,7 +140,7 @@ testHelper(
149140
['--enable-fips'],
150141
compiledWithFips() ? FIPS_ENABLED : OPTION_ERROR_STRING,
151142
'require("crypto").fips',
152-
addToEnv('OPENSSL_CONF', CNF_FIPS_OFF));
143+
Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_OFF }));
153144

154145
// --force-fips should take precedence over OpenSSL config file
155146
testHelper(
@@ -165,7 +156,7 @@ testHelper(
165156
['--force-fips'],
166157
compiledWithFips() ? FIPS_ENABLED : OPTION_ERROR_STRING,
167158
'require("crypto").fips',
168-
addToEnv('OPENSSL_CONF', CNF_FIPS_OFF));
159+
Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_OFF }));
169160

170161
// setFipsCrypto should be able to turn FIPS mode on
171162
testHelper(

‎test/parallel/test-fs-readfile-error.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const fixtures = require('../common/fixtures');
3333
function test(env, cb) {
3434
const filename = fixtures.path('test-fs-readfile-error.js');
3535
const execPath = `"${process.execPath}" "${filename}"`;
36-
const options = { env: Object.assign(process.env, env) };
36+
const options = { env: Object.assign({}, process.env, env) };
3737
exec(execPath, options, common.mustCall((err, stdout, stderr) => {
3838
assert(err);
3939
assert.strictEqual(stdout, '');

‎test/parallel/test-http-server-stale-close.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
'use strict';
2323
require('../common');
2424
const http = require('http');
25-
const util = require('util');
2625
const fork = require('child_process').fork;
2726

2827
if (process.env.NODE_TEST_FORK_PORT) {
@@ -45,7 +44,9 @@ if (process.env.NODE_TEST_FORK_PORT) {
4544
});
4645
server.listen(0, function() {
4746
fork(__filename, {
48-
env: util._extend(process.env, {NODE_TEST_FORK_PORT: this.address().port})
47+
env: Object.assign({}, process.env, {
48+
NODE_TEST_FORK_PORT: this.address().port
49+
})
4950
});
5051
});
5152
}

‎test/parallel/test-icu-data-dir.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const expected =
1717
}
1818

1919
{
20-
const env = { NODE_ICU_DATA: '/' };
20+
const env = Object.assign({}, process.env, { NODE_ICU_DATA: '/' });
2121
const child = spawnSync(process.execPath, ['-e', '0'], { env });
2222
assert(child.stderr.toString().includes(expected));
2323
}

‎test/parallel/test-inspector-open.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ const url = require('url');
1313
if (process.env.BE_CHILD)
1414
return beChild();
1515

16-
const child = fork(__filename, {env: {BE_CHILD: 1}});
16+
const child = fork(__filename,
17+
{ env: Object.assign({}, process.env, { BE_CHILD: 1 }) });
1718

1819
child.once('message', common.mustCall((msg) => {
1920
assert.strictEqual(msg.cmd, 'started');

‎test/parallel/test-npm-install.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ const pkgPath = path.join(installDir, 'package.json');
3434

3535
fs.writeFileSync(pkgPath, pkgContent);
3636

37-
const env = Object.create(process.env);
38-
env['PATH'] = path.dirname(process.execPath);
39-
env['NPM_CONFIG_PREFIX'] = path.join(npmSandbox, 'npm-prefix');
40-
env['NPM_CONFIG_TMP'] = path.join(npmSandbox, 'npm-tmp');
41-
env['HOME'] = path.join(npmSandbox, 'home');
37+
const env = Object.assign({}, process.env, {
38+
PATH: path.dirname(process.execPath),
39+
NPM_CONFIG_PREFIX: path.join(npmSandbox, 'npm-prefix'),
40+
NPM_CONFIG_TMP: path.join(npmSandbox, 'npm-tmp'),
41+
HOME: path.join(npmSandbox, 'home'),
42+
});
4243

4344
exec(`${process.execPath} ${npmPath} install`, {
4445
cwd: installDir,

0 commit comments

Comments
 (0)