diff options
author | Junliang Yan <jyan@ca.ibm.ca> | 2015-10-06 19:45:54 -0400 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2015-10-08 07:51:46 -0700 |
commit | a9d42e013123420444e35cbf56dc15624891b979 (patch) | |
tree | 46a2c54c5b260e8e3685117680ff5c2d3ae4ee31 /test/sequential/test-net-GH-5504.js | |
parent | a214905ff44dbd986303b89f35a7cefff9f6d9d7 (diff) | |
download | android-node-v8-a9d42e013123420444e35cbf56dc15624891b979.tar.gz android-node-v8-a9d42e013123420444e35cbf56dc15624891b979.tar.bz2 android-node-v8-a9d42e013123420444e35cbf56dc15624891b979.zip |
test: fix losing original env vars issue
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
PR-URL: https://github.com/nodejs/node/pull/3190
Diffstat (limited to 'test/sequential/test-net-GH-5504.js')
-rw-r--r-- | test/sequential/test-net-GH-5504.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test/sequential/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js index 0478de55d6..9526993dfd 100644 --- a/test/sequential/test-net-GH-5504.js +++ b/test/sequential/test-net-GH-5504.js @@ -53,12 +53,6 @@ function parent() { var serverExited = false; var clientExited = false; var serverListened = false; - var opt = { - env: { - NODE_DEBUG: 'net', - NODE_COMMON_PORT: process.env.NODE_COMMON_PORT, - } - }; process.on('exit', function() { assert(serverExited); @@ -75,7 +69,11 @@ function parent() { }); }, common.platformTimeout(2000)).unref(); - var s = spawn(node, [__filename, 'server'], opt); + var s = spawn(node, [__filename, 'server'], { + env: Object.assign(process.env, { + NODE_DEBUG: 'net' + }) + }); var c; wrap(s.stderr, process.stderr, 'SERVER 2>'); |