summaryrefslogtreecommitdiff
path: root/test/internet
diff options
context:
space:
mode:
authorGibson Fahnestock <gib@uk.ibm.com>2017-01-08 13:19:00 +0000
committerGibson Fahnestock <gib@uk.ibm.com>2017-01-11 11:43:52 +0000
commit7a0e462f9facfff8ccd7b37eb5b65db1c2b2f55f (patch)
treea971102d320e17e6cb3d00c48fe708b2b86c8136 /test/internet
parent1ef401ce92d6195878b9d041cc969612628f5852 (diff)
downloadandroid-node-v8-7a0e462f9facfff8ccd7b37eb5b65db1c2b2f55f.tar.gz
android-node-v8-7a0e462f9facfff8ccd7b37eb5b65db1c2b2f55f.tar.bz2
android-node-v8-7a0e462f9facfff8ccd7b37eb5b65db1c2b2f55f.zip
test: use eslint to fix var->const/let
Manually fix issues that eslint --fix couldn't do automatically. PR-URL: https://github.com/nodejs/node/pull/10685 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Roman Reiss <me@silverwind.io>
Diffstat (limited to 'test/internet')
-rw-r--r--test/internet/test-dgram-multicast-multi-process.js19
-rw-r--r--test/internet/test-dgram-send-cb-quelches-error.js6
-rw-r--r--test/internet/test-dns-cares-domains.js4
-rw-r--r--test/internet/test-dns.js96
-rw-r--r--test/internet/test-net-connect-timeout.js8
-rw-r--r--test/internet/test-net-connect-unref.js5
-rw-r--r--test/internet/test-tls-connnect-melissadata.js2
7 files changed, 70 insertions, 70 deletions
diff --git a/test/internet/test-dgram-multicast-multi-process.js b/test/internet/test-dgram-multicast-multi-process.js
index de6bf874ed..46f47a5982 100644
--- a/test/internet/test-dgram-multicast-multi-process.js
+++ b/test/internet/test-dgram-multicast-multi-process.js
@@ -13,6 +13,7 @@ const messages = [
];
const workers = {};
const listeners = 3;
+let listening, sendSocket, done, timer, dead;
// Skip test in FreeBSD jails.
@@ -76,10 +77,10 @@ function launchChildProcess(index) {
Object.keys(workers).forEach(function(pid) {
const worker = workers[pid];
- var count = 0;
+ let count = 0;
worker.messagesReceived.forEach(function(buf) {
- for (var i = 0; i < messages.length; ++i) {
+ for (let i = 0; i < messages.length; ++i) {
if (buf.toString() === messages[i].toString()) {
count++;
break;
@@ -110,13 +111,13 @@ function killChildren(children) {
}
if (process.argv[2] !== 'child') {
- var listening = 0;
- var dead = 0;
- var i = 0;
- var done = 0;
+ listening = 0;
+ dead = 0;
+ let i = 0;
+ done = 0;
// Exit the test if it doesn't succeed within TIMEOUT.
- var timer = setTimeout(function() {
+ timer = setTimeout(function() {
console.error('[PARENT] Responses were not received within %d ms.',
TIMEOUT);
console.error('[PARENT] Fail');
@@ -127,11 +128,11 @@ if (process.argv[2] !== 'child') {
}, TIMEOUT);
// Launch child processes.
- for (var x = 0; x < listeners; x++) {
+ for (let x = 0; x < listeners; x++) {
launchChildProcess(x);
}
- var sendSocket = dgram.createSocket('udp4');
+ sendSocket = dgram.createSocket('udp4');
// The socket is actually created async now.
sendSocket.on('listening', function() {
diff --git a/test/internet/test-dgram-send-cb-quelches-error.js b/test/internet/test-dgram-send-cb-quelches-error.js
index e20c8e1070..abcc36859b 100644
--- a/test/internet/test-dgram-send-cb-quelches-error.js
+++ b/test/internet/test-dgram-send-cb-quelches-error.js
@@ -1,12 +1,12 @@
'use strict';
const common = require('../common');
-var mustCall = common.mustCall;
+const mustCall = common.mustCall;
const assert = require('assert');
const dgram = require('dgram');
const dns = require('dns');
-var socket = dgram.createSocket('udp4');
-var buffer = Buffer.from('gary busey');
+const socket = dgram.createSocket('udp4');
+const buffer = Buffer.from('gary busey');
dns.setServers([]);
diff --git a/test/internet/test-dns-cares-domains.js b/test/internet/test-dns-cares-domains.js
index 61ac679274..5328d7e3d9 100644
--- a/test/internet/test-dns-cares-domains.js
+++ b/test/internet/test-dns-cares-domains.js
@@ -4,7 +4,7 @@ const assert = require('assert');
const dns = require('dns');
const domain = require('domain');
-var methods = [
+const methods = [
'resolve4',
'resolve6',
'resolveCname',
@@ -18,7 +18,7 @@ var methods = [
];
methods.forEach(function(method) {
- var d = domain.create();
+ const d = domain.create();
d.run(function() {
dns[method]('google.com', function() {
assert.strictEqual(process.domain, d, method + ' retains domain');
diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
index be3f9b0469..8a857c030a 100644
--- a/test/internet/test-dns.js
+++ b/test/internet/test-dns.js
@@ -15,7 +15,7 @@ const queue = [];
function TEST(f) {
function next() {
- var f = queue.shift();
+ const f = queue.shift();
if (f) {
running = true;
console.log(f.name);
@@ -44,7 +44,7 @@ function checkWrap(req) {
TEST(function test_reverse_bogus(done) {
- var error;
+ let error;
try {
dns.reverse('bogus ip', function() {
@@ -61,12 +61,12 @@ TEST(function test_reverse_bogus(done) {
});
TEST(function test_resolve4_ttl(done) {
- var req = dns.resolve4('google.com', { ttl: true }, function(err, result) {
+ const req = dns.resolve4('google.com', { ttl: true }, function(err, result) {
assert.ifError(err);
assert.ok(result.length > 0);
- for (var i = 0; i < result.length; i++) {
- var item = result[i];
+ for (let i = 0; i < result.length; i++) {
+ const item = result[i];
assert.ok(item);
assert.strictEqual(typeof item, 'object');
assert.strictEqual(typeof item.ttl, 'number');
@@ -82,12 +82,12 @@ TEST(function test_resolve4_ttl(done) {
});
TEST(function test_resolve6_ttl(done) {
- var req = dns.resolve6('google.com', { ttl: true }, function(err, result) {
+ const req = dns.resolve6('google.com', { ttl: true }, function(err, result) {
assert.ifError(err);
assert.ok(result.length > 0);
- for (var i = 0; i < result.length; i++) {
- var item = result[i];
+ for (let i = 0; i < result.length; i++) {
+ const item = result[i];
assert.ok(item);
assert.strictEqual(typeof item, 'object');
assert.strictEqual(typeof item.ttl, 'number');
@@ -103,12 +103,12 @@ TEST(function test_resolve6_ttl(done) {
});
TEST(function test_resolveMx(done) {
- var req = dns.resolveMx('gmail.com', function(err, result) {
+ const req = dns.resolveMx('gmail.com', function(err, result) {
assert.ifError(err);
assert.ok(result.length > 0);
- for (var i = 0; i < result.length; i++) {
- var item = result[i];
+ for (let i = 0; i < result.length; i++) {
+ const item = result[i];
assert.ok(item);
assert.strictEqual(typeof item, 'object');
@@ -125,7 +125,7 @@ TEST(function test_resolveMx(done) {
});
TEST(function test_resolveMx_failure(done) {
- var req = dns.resolveMx('something.invalid', function(err, result) {
+ const req = dns.resolveMx('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -138,12 +138,12 @@ TEST(function test_resolveMx_failure(done) {
});
TEST(function test_resolveNs(done) {
- var req = dns.resolveNs('rackspace.com', function(err, names) {
+ const req = dns.resolveNs('rackspace.com', function(err, names) {
assert.ifError(err);
assert.ok(names.length > 0);
- for (var i = 0; i < names.length; i++) {
- var name = names[i];
+ for (let i = 0; i < names.length; i++) {
+ const name = names[i];
assert.ok(name);
assert.strictEqual(typeof name, 'string');
}
@@ -155,7 +155,7 @@ TEST(function test_resolveNs(done) {
});
TEST(function test_resolveNs_failure(done) {
- var req = dns.resolveNs('something.invalid', function(err, result) {
+ const req = dns.resolveNs('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -168,12 +168,12 @@ TEST(function test_resolveNs_failure(done) {
});
TEST(function test_resolveSrv(done) {
- var req = dns.resolveSrv('_jabber._tcp.google.com', function(err, result) {
+ const req = dns.resolveSrv('_jabber._tcp.google.com', function(err, result) {
assert.ifError(err);
assert.ok(result.length > 0);
- for (var i = 0; i < result.length; i++) {
- var item = result[i];
+ for (let i = 0; i < result.length; i++) {
+ const item = result[i];
assert.ok(item);
assert.strictEqual(typeof item, 'object');
@@ -192,7 +192,7 @@ TEST(function test_resolveSrv(done) {
});
TEST(function test_resolveSrv_failure(done) {
- var req = dns.resolveSrv('something.invalid', function(err, result) {
+ const req = dns.resolveSrv('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -205,12 +205,12 @@ TEST(function test_resolveSrv_failure(done) {
});
TEST(function test_resolvePtr(done) {
- var req = dns.resolvePtr('8.8.8.8.in-addr.arpa', function(err, result) {
+ const req = dns.resolvePtr('8.8.8.8.in-addr.arpa', function(err, result) {
assert.ifError(err);
assert.ok(result.length > 0);
- for (var i = 0; i < result.length; i++) {
- var item = result[i];
+ for (let i = 0; i < result.length; i++) {
+ const item = result[i];
assert.ok(item);
assert.strictEqual(typeof item, 'string');
}
@@ -222,7 +222,7 @@ TEST(function test_resolvePtr(done) {
});
TEST(function test_resolvePtr_failure(done) {
- var req = dns.resolvePtr('something.invalid', function(err, result) {
+ const req = dns.resolvePtr('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -235,12 +235,12 @@ TEST(function test_resolvePtr_failure(done) {
});
TEST(function test_resolveNaptr(done) {
- var req = dns.resolveNaptr('sip2sip.info', function(err, result) {
+ const req = dns.resolveNaptr('sip2sip.info', function(err, result) {
assert.ifError(err);
assert.ok(result.length > 0);
- for (var i = 0; i < result.length; i++) {
- var item = result[i];
+ for (let i = 0; i < result.length; i++) {
+ const item = result[i];
assert.ok(item);
assert.strictEqual(typeof item, 'object');
@@ -259,7 +259,7 @@ TEST(function test_resolveNaptr(done) {
});
TEST(function test_resolveNaptr_failure(done) {
- var req = dns.resolveNaptr('something.invalid', function(err, result) {
+ const req = dns.resolveNaptr('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -272,7 +272,7 @@ TEST(function test_resolveNaptr_failure(done) {
});
TEST(function test_resolveSoa(done) {
- var req = dns.resolveSoa('nodejs.org', function(err, result) {
+ const req = dns.resolveSoa('nodejs.org', function(err, result) {
assert.ifError(err);
assert.ok(result);
assert.strictEqual(typeof result, 'object');
@@ -305,7 +305,7 @@ TEST(function test_resolveSoa(done) {
});
TEST(function test_resolveSoa_failure(done) {
- var req = dns.resolveSoa('something.invalid', function(err, result) {
+ const req = dns.resolveSoa('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -318,12 +318,12 @@ TEST(function test_resolveSoa_failure(done) {
});
TEST(function test_resolveCname(done) {
- var req = dns.resolveCname('www.microsoft.com', function(err, names) {
+ const req = dns.resolveCname('www.microsoft.com', function(err, names) {
assert.ifError(err);
assert.ok(names.length > 0);
- for (var i = 0; i < names.length; i++) {
- var name = names[i];
+ for (let i = 0; i < names.length; i++) {
+ const name = names[i];
assert.ok(name);
assert.strictEqual(typeof name, 'string');
}
@@ -335,7 +335,7 @@ TEST(function test_resolveCname(done) {
});
TEST(function test_resolveCname_failure(done) {
- var req = dns.resolveCname('something.invalid', function(err, result) {
+ const req = dns.resolveCname('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -349,7 +349,7 @@ TEST(function test_resolveCname_failure(done) {
TEST(function test_resolveTxt(done) {
- var req = dns.resolveTxt('google.com', function(err, records) {
+ const req = dns.resolveTxt('google.com', function(err, records) {
assert.ifError(err);
assert.strictEqual(records.length, 1);
assert.ok(util.isArray(records[0]));
@@ -361,7 +361,7 @@ TEST(function test_resolveTxt(done) {
});
TEST(function test_resolveTxt_failure(done) {
- var req = dns.resolveTxt('something.invalid', function(err, result) {
+ const req = dns.resolveTxt('something.invalid', function(err, result) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -375,7 +375,7 @@ TEST(function test_resolveTxt_failure(done) {
TEST(function test_lookup_failure(done) {
- var req = dns.lookup('does.not.exist', 4, function(err, ip, family) {
+ const req = dns.lookup('does.not.exist', 4, function(err, ip, family) {
assert.ok(err instanceof Error);
assert.strictEqual(err.errno, dns.NOTFOUND);
assert.strictEqual(err.errno, 'ENOTFOUND');
@@ -390,7 +390,7 @@ TEST(function test_lookup_failure(done) {
TEST(function test_lookup_null(done) {
- var req = dns.lookup(null, function(err, ip, family) {
+ const req = dns.lookup(null, function(err, ip, family) {
assert.ifError(err);
assert.strictEqual(ip, null);
assert.strictEqual(family, 4);
@@ -403,7 +403,7 @@ TEST(function test_lookup_null(done) {
TEST(function test_lookup_ip_all(done) {
- var req = dns.lookup('127.0.0.1', {all: true}, function(err, ips, family) {
+ const req = dns.lookup('127.0.0.1', {all: true}, function(err, ips, family) {
assert.ifError(err);
assert.ok(Array.isArray(ips));
assert.ok(ips.length > 0);
@@ -418,7 +418,7 @@ TEST(function test_lookup_ip_all(done) {
TEST(function test_lookup_null_all(done) {
- var req = dns.lookup(null, {all: true}, function(err, ips, family) {
+ const req = dns.lookup(null, {all: true}, function(err, ips, family) {
assert.ifError(err);
assert.ok(Array.isArray(ips));
assert.strictEqual(ips.length, 0);
@@ -431,7 +431,7 @@ TEST(function test_lookup_null_all(done) {
TEST(function test_lookup_all_mixed(done) {
- var req = dns.lookup('www.google.com', {all: true}, function(err, ips) {
+ const req = dns.lookup('www.google.com', {all: true}, function(err, ips) {
assert.ifError(err);
assert.ok(Array.isArray(ips));
assert.ok(ips.length > 0);
@@ -453,7 +453,7 @@ TEST(function test_lookup_all_mixed(done) {
TEST(function test_lookupservice_invalid(done) {
- var req = dns.lookupService('1.2.3.4', 80, function(err, host, service) {
+ const req = dns.lookupService('1.2.3.4', 80, function(err, host, service) {
assert(err instanceof Error);
assert.strictEqual(err.code, 'ENOTFOUND');
assert.ok(/1\.2\.3\.4/.test(err.message));
@@ -466,7 +466,7 @@ TEST(function test_lookupservice_invalid(done) {
TEST(function test_reverse_failure(done) {
- var req = dns.reverse('0.0.0.0', function(err) {
+ const req = dns.reverse('0.0.0.0', function(err) {
assert(err instanceof Error);
assert.strictEqual(err.code, 'ENOTFOUND'); // Silly error code...
assert.strictEqual(err.hostname, '0.0.0.0');
@@ -480,7 +480,7 @@ TEST(function test_reverse_failure(done) {
TEST(function test_lookup_failure(done) {
- var req = dns.lookup('nosuchhostimsure', function(err) {
+ const req = dns.lookup('nosuchhostimsure', function(err) {
assert(err instanceof Error);
assert.strictEqual(err.code, 'ENOTFOUND'); // Silly error code...
assert.strictEqual(err.hostname, 'nosuchhostimsure');
@@ -494,7 +494,7 @@ TEST(function test_lookup_failure(done) {
TEST(function test_resolve_failure(done) {
- var req = dns.resolve4('nosuchhostimsure', function(err) {
+ const req = dns.resolve4('nosuchhostimsure', function(err) {
assert(err instanceof Error);
switch (err.code) {
@@ -516,12 +516,12 @@ TEST(function test_resolve_failure(done) {
});
-var getaddrinfoCallbackCalled = false;
+let getaddrinfoCallbackCalled = false;
console.log('looking up nodejs.org...');
-var cares = process.binding('cares_wrap');
-var req = new cares.GetAddrInfoReqWrap();
+const cares = process.binding('cares_wrap');
+const req = new cares.GetAddrInfoReqWrap();
cares.getaddrinfo(req, 'nodejs.org', 4);
req.oncomplete = function(err, domains) {
diff --git a/test/internet/test-net-connect-timeout.js b/test/internet/test-net-connect-timeout.js
index e379f41467..95e25614ff 100644
--- a/test/internet/test-net-connect-timeout.js
+++ b/test/internet/test-net-connect-timeout.js
@@ -7,21 +7,21 @@ const common = require('../common');
const net = require('net');
const assert = require('assert');
-var start = new Date();
+const start = new Date();
-var T = 100;
+const T = 100;
// 192.0.2.1 is part of subnet assigned as "TEST-NET" in RFC 5737.
// For use solely in documentation and example source code.
// In short, it should be unreachable.
// In practice, it's a network black hole.
-var socket = net.createConnection(9999, '192.0.2.1');
+const socket = net.createConnection(9999, '192.0.2.1');
socket.setTimeout(T);
socket.on('timeout', common.mustCall(function() {
console.error('timeout');
- var now = new Date();
+ const now = new Date();
assert.ok(now - start < T + 500);
socket.destroy();
}));
diff --git a/test/internet/test-net-connect-unref.js b/test/internet/test-net-connect-unref.js
index fa45cc711e..f3be840984 100644
--- a/test/internet/test-net-connect-unref.js
+++ b/test/internet/test-net-connect-unref.js
@@ -2,10 +2,9 @@
const common = require('../common');
const net = require('net');
-var client;
-var TIMEOUT = 10 * 1000;
+const TIMEOUT = 10 * 1000;
-client = net.createConnection(53, '8.8.8.8', function() {
+const client = net.createConnection(53, '8.8.8.8', function() {
client.unref();
});
diff --git a/test/internet/test-tls-connnect-melissadata.js b/test/internet/test-tls-connnect-melissadata.js
index 3c6c205d6e..f57b897099 100644
--- a/test/internet/test-tls-connnect-melissadata.js
+++ b/test/internet/test-tls-connnect-melissadata.js
@@ -9,7 +9,7 @@ if (!common.hasCrypto) {
}
const tls = require('tls');
-var socket = tls.connect(443, 'address.melissadata.net', function() {
+const socket = tls.connect(443, 'address.melissadata.net', function() {
socket.resume();
socket.destroy();
});