test: remove envPlus, use Object.assign everywhere

PR-URL: #14845
Backport-PR-URL: #15557Fixes: #14823
Refs: #14822
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>

Author: gibfahn

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

@@ -13,9 +13,12 @@ Object.setPrototypeOf(env, {
 
 letchild;
 if(common.isWindows){
-child=spawn('cmd.exe',['/c','set'],{env: env});
+child=spawn('cmd.exe',['/c','set'],
+Object.assign({},process.env,{env: env}));
 }else{
-child=spawn('/usr/bin/env',[],{env: env});
+child=spawn('/usr/bin/env',[],{env: env});
+child=spawn('/usr/bin/env',[],
+Object.assign({},process.env,{env: env}));
 }
 
 

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

@@ -23,7 +23,9 @@ function after(err, stdout, stderr) {
 if(!common.isWindows){
 child=exec('/usr/bin/env',{env: {'HELLO': 'WORLD'}},after);
 }else{
-child=exec('set',{env: {'HELLO': 'WORLD'}},after);
+child=exec('set',
+{env: Object.assign({},process.env,{'HELLO': 'WORLD'})},
+after);
 }
 
 child.stdout.setEncoding('utf8');

test/parallel/test-crypto-fips.js

@@ -23,15 +23,6 @@ function sharedOpenSSL() {
 returnprocess.config.variables.node_shared_openssl;
 }
 
-functionaddToEnv(newVar,value){
-constenvCopy={};
-for(consteinprocess.env){
-envCopy[e]=process.env[e];
-}
-envCopy[newVar]=value;
-returnenvCopy;
-}
-
 functiontestHelper(stream,args,expectedOutput,cmd,env){
 constfullArgs=args.concat(['-e',`console.log(${cmd})`]);
 constchild=spawnSync(process.execPath,fullArgs,{
@@ -69,7 +60,7 @@ testHelper(
 [],
 FIPS_DISABLED,
 'require("crypto").fips',
-addToEnv('OPENSSL_CONF',''));
+Object.assign({},process.env,{'OPENSSL_CONF':''}));
 
 // --enable-fips should turn FIPS mode on
 testHelper(
@@ -114,23 +105,23 @@ if (!sharedOpenSSL()) {
 [],
 compiledWithFips() ? FIPS_ENABLED : FIPS_DISABLED,
 'require("crypto").fips',
-addToEnv('OPENSSL_CONF',CNF_FIPS_ON));
+Object.assign({},process.env,{'OPENSSL_CONF':CNF_FIPS_ON}));
 
 // --openssl-config option should override OPENSSL_CONF
 testHelper(
 'stdout',
 [`--openssl-config=${CNF_FIPS_ON}`],
 compiledWithFips() ? FIPS_ENABLED : FIPS_DISABLED,
 'require("crypto").fips',
-addToEnv('OPENSSL_CONF',CNF_FIPS_OFF));
+Object.assign({},process.env,{'OPENSSL_CONF':CNF_FIPS_OFF}));
 }
 
 testHelper(
 'stdout',
 [`--openssl-config=${CNF_FIPS_OFF}`],
 FIPS_DISABLED,
 'require("crypto").fips',
-addToEnv('OPENSSL_CONF',CNF_FIPS_ON));
+Object.assign({},process.env,{'OPENSSL_CONF':CNF_FIPS_ON}));
 
 // --enable-fips should take precedence over OpenSSL config file
 testHelper(
@@ -146,7 +137,7 @@ testHelper(
 ['--enable-fips'],
 compiledWithFips() ? FIPS_ENABLED : OPTION_ERROR_STRING,
 'require("crypto").fips',
-addToEnv('OPENSSL_CONF',CNF_FIPS_OFF));
+Object.assign({},process.env,{'OPENSSL_CONF':CNF_FIPS_OFF}));
 
 // --force-fips should take precedence over OpenSSL config file
 testHelper(
@@ -162,7 +153,7 @@ testHelper(
 ['--force-fips'],
 compiledWithFips() ? FIPS_ENABLED : OPTION_ERROR_STRING,
 'require("crypto").fips',
-addToEnv('OPENSSL_CONF',CNF_FIPS_OFF));
+Object.assign({},process.env,{'OPENSSL_CONF':CNF_FIPS_OFF}));
 
 // setFipsCrypto should be able to turn FIPS mode on
 testHelper(

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

@@ -12,7 +12,7 @@ const path = require('path');
 functiontest(env,cb){
 constfilename=path.join(common.fixturesDir,'test-fs-readfile-error.js');
 constexecPath=`"${process.execPath}" "${filename}"`;
-constoptions={env: Object.assign(process.env,env)};
+constoptions={env: Object.assign({},process.env,env)};
 exec(execPath,options,common.mustCall((err,stdout,stderr)=>{
 assert(err);
 assert.strictEqual(stdout,'');

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

@@ -1,7 +1,6 @@
 'use strict';
 require('../common');
 consthttp=require('http');
-constutil=require('util');
 constfork=require('child_process').fork;
 
 if(process.env.NODE_TEST_FORK_PORT){
@@ -24,7 +23,9 @@ if (process.env.NODE_TEST_FORK_PORT) {
 });
 server.listen(0,function(){
 fork(__filename,{
-env: util._extend(process.env,{NODE_TEST_FORK_PORT: this.address().port})
+env: Object.assign({},process.env,{
+NODE_TEST_FORK_PORT: this.address().port
+})
 });
 });
 }

test/parallel/test-npm-install.js

@@ -32,11 +32,12 @@ const pkgPath = path.join(installDir, 'package.json');
 
 fs.writeFileSync(pkgPath,pkgContent);
 
-constenv=Object.create(process.env);
-env['PATH']=path.dirname(process.execPath);
-env['NPM_CONFIG_PREFIX']=path.join(npmSandbox,'npm-prefix');
-env['NPM_CONFIG_TMP']=path.join(npmSandbox,'npm-tmp');
-env['HOME']=path.join(npmSandbox,'home');
+constenv=Object.assign({},process.env,{
+PATH: path.dirname(process.execPath),
+NPM_CONFIG_PREFIX: path.join(npmSandbox,'npm-prefix'),
+NPM_CONFIG_TMP: path.join(npmSandbox,'npm-tmp'),
+HOME: path.join(npmSandbox,'home'),
+});
 
 exec(`${process.execPath}${npmPath} install`,{
 cwd: installDir,

test/parallel/test-repl-envvars.js

@@ -36,7 +36,7 @@ const tests = [
 ];
 
 functionrun(test){
-constenv=test.env;
+constenv=Object.assign({},process.env,test.env);
 constexpected=test.expected;
 constopts={
 terminal: true,

test/parallel/test-stdin-script-child.js

@@ -4,7 +4,7 @@ const assert = require('assert');
 
 constspawn=require('child_process').spawn;
 constchild=spawn(process.execPath,[],{
-env: Object.assign(process.env,{
+env: Object.assign({},process.env,{
 NODE_DEBUG: process.argv[2]
 })
 });

test/sequential/test-net-GH-5504.js

@@ -49,7 +49,7 @@ function parent() {
 constnode=process.execPath;
 
 consts=spawn(node,[__filename,'server'],{
-env: Object.assign(process.env,{
+env: Object.assign({},process.env,{
 NODE_DEBUG: 'net'
 })
 });

test/sequential/test-util-debug.js

@@ -26,7 +26,7 @@ function test(environ, shouldWrite) {
 
 constspawn=require('child_process').spawn;
 constchild=spawn(process.execPath,[__filename,'child'],{
-env: Object.assign(process.env,{NODE_DEBUG: environ})
+env: Object.assign({},process.env,{NODE_DEBUG: environ})
 });
 
 expectErr=expectErr.split('%PID%').join(child.pid);