test: remove envPlus, use Object.assign everywhere · nodejs/node@2c8fe97
@@ -23,15 +23,6 @@ function sharedOpenSSL() {
2323return process.config.variables.node_shared_openssl;
2424}
252526-function addToEnv(newVar, value) {
27-const envCopy = {};
28-for (const e in process.env) {
29-envCopy[e] = process.env[e];
30-}
31-envCopy[newVar] = value;
32-return envCopy;
33-}
34-3526function testHelper(stream, args, expectedOutput, cmd, env) {
3627const fullArgs = args.concat(['-e', `console.log(${cmd})`]);
3728const child = spawnSync(process.execPath, fullArgs, {
@@ -69,7 +60,7 @@ testHelper(
6960[],
7061FIPS_DISABLED,
7162'require("crypto").fips',
72-addToEnv('OPENSSL_CONF', ''));
63+Object.assign({}, process.env, { 'OPENSSL_CONF': '' }));
73647465// --enable-fips should turn FIPS mode on
7566testHelper(
@@ -114,23 +105,23 @@ if (!sharedOpenSSL()) {
114105[],
115106compiledWithFips() ? FIPS_ENABLED : FIPS_DISABLED,
116107'require("crypto").fips',
117-addToEnv('OPENSSL_CONF', CNF_FIPS_ON));
108+Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_ON }));
118109119110// --openssl-config option should override OPENSSL_CONF
120111testHelper(
121112'stdout',
122113[`--openssl-config=${CNF_FIPS_ON}`],
123114compiledWithFips() ? FIPS_ENABLED : FIPS_DISABLED,
124115'require("crypto").fips',
125-addToEnv('OPENSSL_CONF', CNF_FIPS_OFF));
116+Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_OFF }));
126117}
127118128119testHelper(
129120'stdout',
130121[`--openssl-config=${CNF_FIPS_OFF}`],
131122FIPS_DISABLED,
132123'require("crypto").fips',
133-addToEnv('OPENSSL_CONF', CNF_FIPS_ON));
124+Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_ON }));
134125135126// --enable-fips should take precedence over OpenSSL config file
136127testHelper(
@@ -146,7 +137,7 @@ testHelper(
146137['--enable-fips'],
147138compiledWithFips() ? FIPS_ENABLED : OPTION_ERROR_STRING,
148139'require("crypto").fips',
149-addToEnv('OPENSSL_CONF', CNF_FIPS_OFF));
140+Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_OFF }));
150141151142// --force-fips should take precedence over OpenSSL config file
152143testHelper(
@@ -162,7 +153,7 @@ testHelper(
162153['--force-fips'],
163154compiledWithFips() ? FIPS_ENABLED : OPTION_ERROR_STRING,
164155'require("crypto").fips',
165-addToEnv('OPENSSL_CONF', CNF_FIPS_OFF));
156+Object.assign({}, process.env, { 'OPENSSL_CONF': CNF_FIPS_OFF }));
166157167158// setFipsCrypto should be able to turn FIPS mode on
168159testHelper(