summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorVse Mozhet Byt <vsemozhetbyt@gmail.com>2017-07-15 03:30:28 +0300
committerVse Mozhet Byt <vsemozhetbyt@gmail.com>2017-07-21 20:40:52 +0300
commit4f875222445b07016a8294fa5a5bf7418c735489 (patch)
treefcb4996be68507c06dec905eacff6300d74319e7 /test
parent43bd47c352a368db6051b1017225abace015d3c9 (diff)
downloadandroid-node-v8-4f875222445b07016a8294fa5a5bf7418c735489.tar.gz
android-node-v8-4f875222445b07016a8294fa5a5bf7418c735489.tar.bz2
android-node-v8-4f875222445b07016a8294fa5a5bf7418c735489.zip
doc, lib, test: do not re-require needlessly
PR-URL: https://github.com/nodejs/node/pull/14244 Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/common/index.js15
-rw-r--r--test/parallel/test-assert-typedarray-deepequal.js6
-rw-r--r--test/parallel/test-assert.js2
-rw-r--r--test/parallel/test-child-process-fork-and-spawn.js3
-rw-r--r--test/parallel/test-child-process-send-returns-boolean.js3
-rw-r--r--test/parallel/test-crypto-random.js4
-rw-r--r--test/parallel/test-domain-exit-dispose.js1
-rw-r--r--test/parallel/test-handle-wrap-isrefed.js4
-rw-r--r--test/parallel/test-http-invalidheaderfield2.js19
-rw-r--r--test/parallel/test-listen-fd-detached.js1
-rw-r--r--test/parallel/test-net-pause-resume-connecting.js10
-rw-r--r--test/parallel/test-process-exit-code.js27
-rw-r--r--test/parallel/test-readline-interface.js3
-rw-r--r--test/parallel/test-require-symlink.js3
-rw-r--r--test/parallel/test-stream2-push.js3
-rw-r--r--test/parallel/test-tls-session-cache.js17
-rw-r--r--test/pummel/test-vm-memleak.js5
-rw-r--r--test/sequential/test-child-process-execsync.js3
-rw-r--r--test/sequential/test-module-loading.js2
19 files changed, 60 insertions, 71 deletions
diff --git a/test/common/index.js b/test/common/index.js
index 63e94adae5..0537cd784e 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -25,11 +25,10 @@ const path = require('path');
const fs = require('fs');
const assert = require('assert');
const os = require('os');
-const child_process = require('child_process');
+const { exec, execSync, spawn, spawnSync } = require('child_process');
const stream = require('stream');
const util = require('util');
const Timer = process.binding('timer_wrap').Timer;
-const execSync = require('child_process').execSync;
const testRoot = process.env.NODE_TEST_DIR ?
fs.realpathSync(process.env.NODE_TEST_DIR) : path.resolve(__dirname, '..');
@@ -186,7 +185,7 @@ Object.defineProperty(exports, 'inFreeBSDJail', {
if (inFreeBSDJail !== null) return inFreeBSDJail;
if (exports.isFreeBSD &&
- child_process.execSync('sysctl -n security.jail.jailed').toString() ===
+ execSync('sysctl -n security.jail.jailed').toString() ===
'1\n') {
inFreeBSDJail = true;
} else {
@@ -233,7 +232,7 @@ Object.defineProperty(exports, 'opensslCli', {get: function() {
if (exports.isWindows) opensslCli += '.exe';
- const opensslCmd = child_process.spawnSync(opensslCli, ['version']);
+ const opensslCmd = spawnSync(opensslCli, ['version']);
if (opensslCmd.status !== 0 || opensslCmd.error !== undefined) {
// openssl command cannot be executed
opensslCli = false;
@@ -283,7 +282,7 @@ exports.childShouldThrowAndAbort = function() {
}
testCmd += `"${process.argv[0]}" --abort-on-uncaught-exception `;
testCmd += `"${process.argv[1]}" child`;
- const child = child_process.exec(testCmd);
+ const child = exec(testCmd);
child.on('exit', function onExit(exitCode, signal) {
const errMsg = 'Test should have aborted ' +
`but instead exited with exit code ${exitCode}` +
@@ -303,8 +302,6 @@ exports.ddCommand = function(filename, kilobytes) {
exports.spawnPwd = function(options) {
- const spawn = require('child_process').spawn;
-
if (exports.isWindows) {
return spawn('cmd.exe', ['/d', '/c', 'cd'], options);
} else {
@@ -314,8 +311,6 @@ exports.spawnPwd = function(options) {
exports.spawnSyncPwd = function(options) {
- const spawnSync = require('child_process').spawnSync;
-
if (exports.isWindows) {
return spawnSync('cmd.exe', ['/d', '/c', 'cd'], options);
} else {
@@ -789,7 +784,7 @@ exports.getTTYfd = function getTTYfd() {
else if (!tty.isatty(tty_fd)) tty_fd++;
else {
try {
- tty_fd = require('fs').openSync('/dev/tty');
+ tty_fd = fs.openSync('/dev/tty');
} catch (e) {
// There aren't any tty fd's available to use.
return -1;
diff --git a/test/parallel/test-assert-typedarray-deepequal.js b/test/parallel/test-assert-typedarray-deepequal.js
index f5ecb274a8..7eed19cc53 100644
--- a/test/parallel/test-assert-typedarray-deepequal.js
+++ b/test/parallel/test-assert-typedarray-deepequal.js
@@ -2,7 +2,6 @@
require('../common');
const assert = require('assert');
-const a = require('assert');
function makeBlock(f) {
const args = Array.prototype.slice.call(arguments, 1);
@@ -51,7 +50,8 @@ equalArrayPairs.forEach((arrayPair) => {
notEqualArrayPairs.forEach((arrayPair) => {
assert.throws(
- makeBlock(a.deepEqual, arrayPair[0], arrayPair[1]),
- a.AssertionError
+ // eslint-disable-next-line no-restricted-properties
+ makeBlock(assert.deepEqual, arrayPair[0], arrayPair[1]),
+ assert.AssertionError
);
});
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
index 348927cd5c..a79da93d82 100644
--- a/test/parallel/test-assert.js
+++ b/test/parallel/test-assert.js
@@ -22,7 +22,7 @@
'use strict';
const common = require('../common');
const assert = require('assert');
-const a = require('assert');
+const a = assert;
function makeBlock(f) {
const args = Array.prototype.slice.call(arguments, 1);
diff --git a/test/parallel/test-child-process-fork-and-spawn.js b/test/parallel/test-child-process-fork-and-spawn.js
index 5d4446d98a..88e634ba8b 100644
--- a/test/parallel/test-child-process-fork-and-spawn.js
+++ b/test/parallel/test-child-process-fork-and-spawn.js
@@ -22,8 +22,7 @@
'use strict';
const common = require('../common');
const assert = require('assert');
-const spawn = require('child_process').spawn;
-const fork = require('child_process').fork;
+const { fork, spawn } = require('child_process');
// Fork, then spawn. The spawned process should not hang.
switch (process.argv[2] || '') {
diff --git a/test/parallel/test-child-process-send-returns-boolean.js b/test/parallel/test-child-process-send-returns-boolean.js
index 379f76a673..d986b633d4 100644
--- a/test/parallel/test-child-process-send-returns-boolean.js
+++ b/test/parallel/test-child-process-send-returns-boolean.js
@@ -3,8 +3,7 @@ const common = require('../common');
const assert = require('assert');
const path = require('path');
const net = require('net');
-const fork = require('child_process').fork;
-const spawn = require('child_process').spawn;
+const { fork, spawn } = require('child_process');
const emptyFile = path.join(common.fixturesDir, 'empty.js');
diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js
index 6d1e40b87f..d9fa7efd9b 100644
--- a/test/parallel/test-crypto-random.js
+++ b/test/parallel/test-crypto-random.js
@@ -148,6 +148,8 @@ const expectedErrorRegexp = /^TypeError: size must be a number >= 0$/;
bufferTooSmall: /^RangeError: buffer too small$/,
};
+ const max = require('buffer').kMaxLength + 1;
+
for (const buf of bufs) {
const len = Buffer.byteLength(buf);
assert.strictEqual(len, 10, `Expected byteLength of 10, got ${len}`);
@@ -168,8 +170,6 @@ const expectedErrorRegexp = /^TypeError: size must be a number >= 0$/;
crypto.randomFill(buf, NaN, common.mustNotCall());
}, errMessages.offsetNotNumber);
- const max = require('buffer').kMaxLength + 1;
-
assert.throws(() => {
crypto.randomFillSync(buf, 11);
}, errMessages.offsetOutOfRange);
diff --git a/test/parallel/test-domain-exit-dispose.js b/test/parallel/test-domain-exit-dispose.js
index be56f4dfbb..0bc8adae82 100644
--- a/test/parallel/test-domain-exit-dispose.js
+++ b/test/parallel/test-domain-exit-dispose.js
@@ -20,7 +20,6 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.
'use strict';
-require('../common');
const common = require('../common');
const assert = require('assert');
const domain = require('domain');
diff --git a/test/parallel/test-handle-wrap-isrefed.js b/test/parallel/test-handle-wrap-isrefed.js
index 66353fcc03..3fc115fdc2 100644
--- a/test/parallel/test-handle-wrap-isrefed.js
+++ b/test/parallel/test-handle-wrap-isrefed.js
@@ -24,9 +24,10 @@ const strictEqual = require('assert').strictEqual;
}
+const dgram = require('dgram');
+
// dgram ipv4
{
- const dgram = require('dgram');
const sock4 = dgram.createSocket('udp4');
strictEqual(Object.getPrototypeOf(sock4._handle).hasOwnProperty('hasRef'),
true, 'udp_wrap: ipv4: hasRef() missing');
@@ -46,7 +47,6 @@ const strictEqual = require('assert').strictEqual;
// dgram ipv6
{
- const dgram = require('dgram');
const sock6 = dgram.createSocket('udp6');
strictEqual(Object.getPrototypeOf(sock6._handle).hasOwnProperty('hasRef'),
true, 'udp_wrap: ipv6: hasRef() missing');
diff --git a/test/parallel/test-http-invalidheaderfield2.js b/test/parallel/test-http-invalidheaderfield2.js
index 2267c8565c..40415d9c36 100644
--- a/test/parallel/test-http-invalidheaderfield2.js
+++ b/test/parallel/test-http-invalidheaderfield2.js
@@ -2,8 +2,7 @@
require('../common');
const assert = require('assert');
const inspect = require('util').inspect;
-const checkIsHttpToken = require('_http_common')._checkIsHttpToken;
-const checkInvalidHeaderChar = require('_http_common')._checkInvalidHeaderChar;
+const { _checkIsHttpToken, _checkInvalidHeaderChar } = require('_http_common');
// Good header field names
[
@@ -29,8 +28,8 @@ const checkInvalidHeaderChar = require('_http_common')._checkInvalidHeaderChar;
'3.14159265359'
].forEach(function(str) {
assert.strictEqual(
- checkIsHttpToken(str), true,
- `checkIsHttpToken(${inspect(str)}) unexpectedly failed`);
+ _checkIsHttpToken(str), true,
+ `_checkIsHttpToken(${inspect(str)}) unexpectedly failed`);
});
// Bad header field names
[
@@ -55,8 +54,8 @@ const checkInvalidHeaderChar = require('_http_common')._checkInvalidHeaderChar;
'This,That'
].forEach(function(str) {
assert.strictEqual(
- checkIsHttpToken(str), false,
- `checkIsHttpToken(${inspect(str)}) unexpectedly succeeded`);
+ _checkIsHttpToken(str), false,
+ `_checkIsHttpToken(${inspect(str)}) unexpectedly succeeded`);
});
@@ -68,8 +67,8 @@ const checkInvalidHeaderChar = require('_http_common')._checkInvalidHeaderChar;
'!@#$%^&*()-_=+\\;\':"[]{}<>,./?|~`'
].forEach(function(str) {
assert.strictEqual(
- checkInvalidHeaderChar(str), false,
- `checkInvalidHeaderChar(${inspect(str)}) unexpectedly failed`);
+ _checkInvalidHeaderChar(str), false,
+ `_checkInvalidHeaderChar(${inspect(str)}) unexpectedly failed`);
});
// Bad header field values
@@ -84,6 +83,6 @@ const checkInvalidHeaderChar = require('_http_common')._checkInvalidHeaderChar;
'Ding!\x07'
].forEach(function(str) {
assert.strictEqual(
- checkInvalidHeaderChar(str), true,
- `checkInvalidHeaderChar(${inspect(str)}) unexpectedly succeeded`);
+ _checkInvalidHeaderChar(str), true,
+ `_checkInvalidHeaderChar(${inspect(str)}) unexpectedly succeeded`);
});
diff --git a/test/parallel/test-listen-fd-detached.js b/test/parallel/test-listen-fd-detached.js
index cc9cb6471e..b2b9c74a9a 100644
--- a/test/parallel/test-listen-fd-detached.js
+++ b/test/parallel/test-listen-fd-detached.js
@@ -85,7 +85,6 @@ function parent() {
}).listen(0, function() {
console.error('server listening on %d', this.address().port);
- const spawn = require('child_process').spawn;
const child = spawn(process.execPath, [__filename, 'child'], {
stdio: [ 'ignore', 'ignore', 'ignore', server._handle ],
detached: true
diff --git a/test/parallel/test-net-pause-resume-connecting.js b/test/parallel/test-net-pause-resume-connecting.js
index 39d8315992..920522b760 100644
--- a/test/parallel/test-net-pause-resume-connecting.js
+++ b/test/parallel/test-net-pause-resume-connecting.js
@@ -40,27 +40,27 @@ const server = net.createServer(function(conn) {
server.listen(0, function() {
// Client 1
- conn = require('net').createConnection(this.address().port, 'localhost');
+ conn = net.createConnection(this.address().port, 'localhost');
conn.resume();
conn.on('data', onDataOk);
// Client 2
- conn = require('net').createConnection(this.address().port, 'localhost');
+ conn = net.createConnection(this.address().port, 'localhost');
conn.pause();
conn.resume();
conn.on('data', onDataOk);
// Client 3
- conn = require('net').createConnection(this.address().port, 'localhost');
+ conn = net.createConnection(this.address().port, 'localhost');
conn.pause();
conn.on('data', common.mustNotCall());
scheduleTearDown(conn);
// Client 4
- conn = require('net').createConnection(this.address().port, 'localhost');
+ conn = net.createConnection(this.address().port, 'localhost');
conn.resume();
conn.pause();
conn.resume();
@@ -68,7 +68,7 @@ server.listen(0, function() {
// Client 5
- conn = require('net').createConnection(this.address().port, 'localhost');
+ conn = net.createConnection(this.address().port, 'localhost');
conn.resume();
conn.resume();
conn.pause();
diff --git a/test/parallel/test-process-exit-code.js b/test/parallel/test-process-exit-code.js
index e84be0aead..4deebb54a1 100644
--- a/test/parallel/test-process-exit-code.js
+++ b/test/parallel/test-process-exit-code.js
@@ -83,22 +83,23 @@ function child5() {
}
function parent() {
+ const { spawn } = require('child_process');
+ const node = process.execPath;
+ const f = __filename;
+ const option = { stdio: [ 0, 1, 'ignore' ] };
+
+ const test = (arg, exit) => {
+ spawn(node, [f, arg], option).on('exit', (code) => {
+ assert.strictEqual(
+ code, exit,
+ `wrong exit for ${arg}\nexpected:${exit} but got:${code}`);
+ console.log('ok - %s exited with %d', arg, exit);
+ });
+ };
+
test('child1', 42);
test('child2', 42);
test('child3', 0);
test('child4', 1);
test('child5', 99);
}
-
-function test(arg, exit) {
- const spawn = require('child_process').spawn;
- const node = process.execPath;
- const f = __filename;
- const option = { stdio: [ 0, 1, 'ignore' ] };
- spawn(node, [f, arg], option).on('exit', function(code) {
- assert.strictEqual(
- code, exit,
- `wrong exit for ${arg}\nexpected:${exit} but got:${code}`);
- console.log('ok - %s exited with %d', arg, exit);
- });
-}
diff --git a/test/parallel/test-readline-interface.js b/test/parallel/test-readline-interface.js
index 9acfb5421d..25cd738bf2 100644
--- a/test/parallel/test-readline-interface.js
+++ b/test/parallel/test-readline-interface.js
@@ -27,8 +27,7 @@ const readline = require('readline');
const internalReadline = require('internal/readline');
const EventEmitter = require('events').EventEmitter;
const inherits = require('util').inherits;
-const Writable = require('stream').Writable;
-const Readable = require('stream').Readable;
+const { Writable, Readable } = require('stream');
function FakeInput() {
EventEmitter.call(this);
diff --git a/test/parallel/test-require-symlink.js b/test/parallel/test-require-symlink.js
index d5dc03e49d..5608df4eaf 100644
--- a/test/parallel/test-require-symlink.js
+++ b/test/parallel/test-require-symlink.js
@@ -4,8 +4,7 @@ const common = require('../common');
const assert = require('assert');
const path = require('path');
const fs = require('fs');
-const exec = require('child_process').exec;
-const spawn = require('child_process').spawn;
+const { exec, spawn } = require('child_process');
const util = require('util');
common.refreshTmpDir();
diff --git a/test/parallel/test-stream2-push.js b/test/parallel/test-stream2-push.js
index 88531d9e3d..21dc303695 100644
--- a/test/parallel/test-stream2-push.js
+++ b/test/parallel/test-stream2-push.js
@@ -21,9 +21,8 @@
'use strict';
require('../common');
-const Readable = require('stream').Readable;
-const Writable = require('stream').Writable;
const assert = require('assert');
+const { Readable, Writable } = require('stream');
const EE = require('events').EventEmitter;
diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js
index 805c21b3ad..a6d00d2c07 100644
--- a/test/parallel/test-tls-session-cache.js
+++ b/test/parallel/test-tls-session-cache.js
@@ -28,6 +28,15 @@ if (!common.opensslCli)
if (!common.hasCrypto)
common.skip('missing crypto');
+const assert = require('assert');
+const tls = require('tls');
+const fs = require('fs');
+const { join } = require('path');
+const { spawn } = require('child_process');
+
+const keyFile = join(common.fixturesDir, 'agent.key');
+const certFile = join(common.fixturesDir, 'agent.crt');
+
doTest({ tickets: false }, function() {
doTest({ tickets: true }, function() {
doTest({ tickets: false, invalidSession: true }, function() {
@@ -37,14 +46,6 @@ doTest({ tickets: false }, function() {
});
function doTest(testOptions, callback) {
- const assert = require('assert');
- const tls = require('tls');
- const fs = require('fs');
- const join = require('path').join;
- const spawn = require('child_process').spawn;
-
- const keyFile = join(common.fixturesDir, 'agent.key');
- const certFile = join(common.fixturesDir, 'agent.crt');
const key = fs.readFileSync(keyFile);
const cert = fs.readFileSync(certFile);
const options = {
diff --git a/test/pummel/test-vm-memleak.js b/test/pummel/test-vm-memleak.js
index 79c22f030f..601781fec2 100644
--- a/test/pummel/test-vm-memleak.js
+++ b/test/pummel/test-vm-memleak.js
@@ -24,6 +24,7 @@
require('../common');
const assert = require('assert');
+const vm = require('vm');
const start = Date.now();
let maxMem = 0;
@@ -35,7 +36,7 @@ assert(ok, 'Run this test with --max_old_space_size=32.');
const interval = setInterval(function() {
try {
- require('vm').runInNewContext('throw 1;');
+ vm.runInNewContext('throw 1;');
} catch (e) {
}
@@ -52,7 +53,7 @@ const interval = setInterval(function() {
function testContextLeak() {
for (let i = 0; i < 1000; i++)
- require('vm').createContext({});
+ vm.createContext({});
}
process.on('exit', function() {
diff --git a/test/sequential/test-child-process-execsync.js b/test/sequential/test-child-process-execsync.js
index 4dc11253c9..4fb2915010 100644
--- a/test/sequential/test-child-process-execsync.js
+++ b/test/sequential/test-child-process-execsync.js
@@ -23,8 +23,7 @@
const common = require('../common');
const assert = require('assert');
-const execSync = require('child_process').execSync;
-const execFileSync = require('child_process').execFileSync;
+const { execFileSync, execSync } = require('child_process');
const TIMER = 200;
const SLEEP = 2000;
diff --git a/test/sequential/test-module-loading.js b/test/sequential/test-module-loading.js
index 8a7bfe15c4..b117555a22 100644
--- a/test/sequential/test-module-loading.js
+++ b/test/sequential/test-module-loading.js
@@ -146,7 +146,7 @@ try {
assert.strictEqual(e.message, 'blah');
}
-assert.strictEqual(require('path').dirname(__filename), __dirname);
+assert.strictEqual(path.dirname(__filename), __dirname);
console.error('load custom file types with extensions');
require.extensions['.test'] = function(module, filename) {