summaryrefslogtreecommitdiff
path: root/test/parallel/test-require-symlink.js
diff options
context:
space:
mode:
authorGibson Fahnestock <gibfahn@gmail.com>2017-08-15 19:14:54 +0100
committerRuben Bridgewater <ruben@bridgewater.de>2017-09-03 17:28:50 -0300
commit180f86507d496b11aa35b2df4594629a92cce329 (patch)
tree96993491524bbba0fb642f9c3c47f89b2fedf3b0 /test/parallel/test-require-symlink.js
parented084a035c1f657284f3eee7f7a583a42e8b35f1 (diff)
downloadandroid-node-v8-180f86507d496b11aa35b2df4594629a92cce329.tar.gz
android-node-v8-180f86507d496b11aa35b2df4594629a92cce329.tar.bz2
android-node-v8-180f86507d496b11aa35b2df4594629a92cce329.zip
test: remove envPlus, use Object.assign everywhere
PR-URL: https://github.com/nodejs/node/pull/14845 Fixes: https://github.com/nodejs/node/issues/14823 Refs: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'test/parallel/test-require-symlink.js')
-rw-r--r--test/parallel/test-require-symlink.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/parallel/test-require-symlink.js b/test/parallel/test-require-symlink.js
index 8f15845947..4dd9bf51ed 100644
--- a/test/parallel/test-require-symlink.js
+++ b/test/parallel/test-require-symlink.js
@@ -5,7 +5,6 @@ const assert = require('assert');
const path = require('path');
const fs = require('fs');
const { exec, spawn } = require('child_process');
-const util = require('util');
const fixtures = require('../common/fixtures');
common.refreshTmpDir();
@@ -61,7 +60,7 @@ function test() {
// Also verify that symlinks works for setting preserve via env variables
const childEnv = spawn(node, [linkScript], {
- env: util._extend(process.env, { NODE_PRESERVE_SYMLINKS: '1' })
+ env: Object.assign({}, process.env, { NODE_PRESERVE_SYMLINKS: '1' })
});
childEnv.on('close', function(code, signal) {
assert.strictEqual(code, 0);