tests: append instead of override environment

Some tests that rely on some environment variables being passed to child processes would fail because they reset the child processes' environment instead of appending to it. This would break on test environments where some custom environment variables are needed to make node work properly. PORT-FROM: joyent/node @ e64ee2b3f7b4067101b0291f1add842353cd6865 This port is modified to move the function into common.js per nodejs/node#25 (comment) PR-URL: nodejs/node#43 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
nodejs · Jun 18, 2015 · e11fe0c · e11fe0c
1 parent 33943da
commit e11fe0c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/test/common.js b/test/common.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var assert = require('assert');
 var os = require('os');
 var child_process = require('child_process');
+var util = require('util');
 
 exports.testDir = path.dirname(__filename);
 exports.fixturesDir = path.join(exports.testDir, 'fixtures');
@@ -119,7 +120,6 @@ exports.hasIPv6 = Object.keys(ifaces).some(function(name) {
   });
 });
 
-var util = require('util');
 for (var i in util) exports[i] = util[i];
 //for (var i in exports) global[i] = exports[i];
 
@@ -408,3 +408,7 @@ exports.fileExists = function(pathname) {
     return false;
   }
 };
+
+exports.extendEnv = function(env) {
+  return util._extend(process.env, env);
+};
diff --git a/test/parallel/test-child-process-spawnsync-env.js b/test/parallel/test-child-process-spawnsync-env.js
@@ -8,7 +8,7 @@ if (process.argv[2] === 'child') {
 } else {
   var expected = 'bar';
   var child = cp.spawnSync(process.execPath, [__filename, 'child'], {
-    env: {foo: expected}
+    env: common.extendEnv({foo: expected})
   });
 
   assert.equal(child.stdout.toString().trim(), expected);

diff --git a/test/parallel/test-fs-readfile-error.js b/test/parallel/test-fs-readfile-error.js
@@ -16,7 +16,7 @@ var callbacks = 0;
 function test(env, cb) {
   var filename = path.join(common.fixturesDir, 'test-fs-readfile-error.js');
   var execPath = '"' + process.execPath + '" "' + filename + '"';
-  var options = { env: env || {} };
+  var options = { env: common.extendEnv(env || {}) };
   exec(execPath, options, function(err, stdout, stderr) {
     assert(err);
     assert.equal(stdout, '');

diff --git a/test/sequential/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js
@@ -54,10 +54,9 @@ function parent() {
   var clientExited = false;
   var serverListened = false;
   var opt = {
-    env: {
-      NODE_DEBUG: 'net',
-      NODE_COMMON_PORT: process.env.NODE_COMMON_PORT,
-    }
+    env: common.extendEnv({
+      NODE_DEBUG: 'net'
+    })
   };
 
   process.on('exit', function() {
@@ -105,4 +104,3 @@ function parent() {
     });
   }
 }
-
diff --git a/test/sequential/test-stdin-script-child.js b/test/sequential/test-stdin-script-child.js
@@ -4,9 +4,9 @@ var assert = require('assert');
 
 var spawn = require('child_process').spawn;
 var child = spawn(process.execPath, [], {
-  env: {
+  env: common.extendEnv({
     NODE_DEBUG: process.argv[2]
-  }
+  })
 });
 var wanted = child.pid + '\n';
 var found = '';

diff --git a/test/sequential/test-util-debug.js b/test/sequential/test-util-debug.js
@@ -32,7 +32,9 @@ function test(environ, shouldWrite) {
     // env variable is passed to the child to make the test pass.
     // this is fixed in the next version of lttng (2.7+), so we can
     // remove it at sometime in the future.
-    env: { NODE_DEBUG: environ, HOME: process.env.HOME }
+    env: common.extendEnv({
+      NODE_DEBUG: environ
+    })
   });
 
   expectErr = expectErr.split('%PID%').join(child.pid);