test: fix style issues after eslint update

Replace var keyword with const or let.

PR-URL: https://github.com/nodejs/io.js/pull/2286
Reviewed-By: Roman Reiss <me@silverwind.io>

test/gc/test-http-client-connaborted.js

@@ -6,15 +6,15 @@ function serverHandler(req, res) {
   res.connection.destroy();
 }
 
-var http  = require('http'),
+const http  = require('http');
-    weak    = require('weak'),
+const weak = require('weak');
-    done    = 0,
+const common = require('../common');
-    count   = 0,
+const assert = require('assert');
-    countGC = 0,
+const PORT = common.PORT;
-    todo    = 500,
+const todo = 500;
-    common = require('../common'),
+let done = 0;
-    assert = require('assert'),
+let count = 0;
-    PORT = common.PORT;
+let countGC = 0;
 
 console.log('We should do ' + todo + ' requests');
 

test/gc/test-http-client-onerror.js

@@ -8,15 +8,15 @@ function serverHandler(req, res) {
   res.end('Hello World\n');
 }
 
-var http  = require('http'),
+const http = require('http');
-    weak    = require('weak'),
+const weak = require('weak');
-    done    = 0,
+const common = require('../common');
-    count   = 0,
+const assert = require('assert');
-    countGC = 0,
+const PORT = common.PORT;
-    todo    = 500,
+const todo = 500;
-    common = require('../common'),
+let done = 0;
-    assert = require('assert'),
+let count = 0;
-    PORT = common.PORT;
+let countGC = 0;
 
 console.log('We should do ' + todo + ' requests');
 

test/gc/test-http-client-timeout.js

@@ -10,15 +10,15 @@ function serverHandler(req, res) {
   }, 100);
 }
 
-var http  = require('http'),
+const http = require('http');
-    weak    = require('weak'),
+const weak = require('weak');
-    done    = 0,
+const common = require('../common');
-    count   = 0,
+const assert = require('assert');
-    countGC = 0,
+const PORT = common.PORT;
-    todo    = 550,
+const todo = 550;
-    common = require('../common'),
+let done = 0;
-    assert = require('assert'),
+let count = 0;
-    PORT = common.PORT;
+let countGC = 0;
 
 console.log('We should do ' + todo + ' requests');
 

test/gc/test-http-client.js

@@ -6,15 +6,15 @@ function serverHandler(req, res) {
   res.end('Hello World\n');
 }
 
-var http  = require('http'),
+const http = require('http');
-    weak    = require('weak'),
+const weak = require('weak');
-    done    = 0,
+const common = require('../common');
-    count   = 0,
+const assert = require('assert');
-    countGC = 0,
+const PORT = common.PORT;
-    todo    = 500,
+const todo = 500;
-    common = require('../common'),
+let done = 0;
-    assert = require('assert'),
+let count = 0;
-    PORT = common.PORT;
+let countGC = 0;
 
 console.log('We should do ' + todo + ' requests');
 

test/gc/test-net-timeout.js

@@ -17,15 +17,15 @@ function serverHandler(sock) {
   }, 100);
 }
 
-var net  = require('net'),
+const net = require('net');
-    weak    = require('weak'),
+const weak = require('weak');
-    done    = 0,
+const common = require('../common');
-    count   = 0,
+const assert = require('assert');
-    countGC = 0,
+const PORT = common.PORT;
-    todo    = 500,
+const todo = 500;
-    common = require('../common'),
+let done = 0;
-    assert = require('assert'),
+let count = 0;
-    PORT = common.PORT;
+let countGC = 0;
 
 console.log('We should do ' + todo + ' requests');
 

test/internet/test-dgram-broadcast-multi-process.js

@@ -1,14 +1,14 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    dgram = require('dgram'),
+const dgram = require('dgram');
-    util = require('util'),
+const util = require('util');
-    networkInterfaces = require('os').networkInterfaces(),
+const networkInterfaces = require('os').networkInterfaces();
-    Buffer = require('buffer').Buffer,
+const Buffer = require('buffer').Buffer;
-    fork = require('child_process').fork,
+const fork = require('child_process').fork;
-    LOCAL_BROADCAST_HOST = '255.255.255.255',
+const LOCAL_BROADCAST_HOST = '255.255.255.255';
-    TIMEOUT = common.platformTimeout(5000),
+const TIMEOUT = common.platformTimeout(5000);
-    messages = [
+const messages = [
   new Buffer('First message to send'),
   new Buffer('Second message to send'),
   new Buffer('Third message to send'),
@@ -34,13 +34,13 @@ get_bindAddress: for (var name in networkInterfaces) {
 assert.ok(bindAddress);
 
 if (process.argv[2] !== 'child') {
-  var workers = {},
+  const workers = {};
-      listeners = 3,
+  const listeners = 3;
-      listening = 0,
+  let listening = 0;
-      dead = 0,
+  let dead = 0;
-      i = 0,
+  let i = 0;
-      done = 0,
+  let done = 0;
-      timer = null;
+  let timer = null;
 
   //exit the test if it doesn't succeed within TIMEOUT
   timer = setTimeout(function() {
@@ -166,15 +166,21 @@ if (process.argv[2] !== 'child') {
       return;
     }
 
-    sendSocket.send(buf, 0, buf.length,
+    sendSocket.send(
-                    common.PORT, LOCAL_BROADCAST_HOST, function(err) {
+      buf,
+      0,
+      buf.length,
+      common.PORT,
+      LOCAL_BROADCAST_HOST,
+      function(err) {
         if (err) throw err;
         console.error('[PARENT] sent %s to %s:%s',
                       util.inspect(buf.toString()),
                       LOCAL_BROADCAST_HOST, common.PORT);
 
         process.nextTick(sendSocket.sendNext);
-        });
+      }
+    );
   };
 
   function killChildren(children) {

test/internet/test-dgram-multicast-multi-process.js

@@ -157,14 +157,20 @@ if (process.argv[2] !== 'child') {
       return;
     }
 
-    sendSocket.send(buf, 0, buf.length,
+    sendSocket.send(
-                    common.PORT, LOCAL_BROADCAST_HOST, function(err) {
+      buf,
+      0,
+      buf.length,
+      common.PORT,
+      LOCAL_BROADCAST_HOST,
+      function(err) {
         if (err) throw err;
         console.error('[PARENT] sent "%s" to %s:%s',
                       buf.toString(),
                       LOCAL_BROADCAST_HOST, common.PORT);
         process.nextTick(sendSocket.sendNext);
-        });
+      }
+    );
   };
 }
 

test/internet/test-dns-ipv4.js

@@ -1,14 +1,14 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    dns = require('dns'),
+const dns = require('dns');
-    net = require('net'),
+const net = require('net');
-    isIPv4 = net.isIPv4;
+const isIPv4 = net.isIPv4;
 
-var expected = 0,
+let expected = 0;
-    completed = 0,
+let completed = 0;
-    running = false,
+let running = false;
-    queue = [];
+const queue = [];
 
 function TEST(f) {
   function next() {
@@ -148,7 +148,9 @@ TEST(function test_lookup_localhost_ipv4(done) {
 });
 
 TEST(function test_lookup_all_ipv4(done) {
-  var req = dns.lookup('www.google.com', {all: true, family: 4},
+  var req = dns.lookup(
+    'www.google.com',
+    {all: true, family: 4},
     function(err, ips) {
       if (err) throw err;
       assert.ok(Array.isArray(ips));
@@ -160,7 +162,8 @@ TEST(function test_lookup_all_ipv4(done) {
       });
 
       done();
-  });
+    }
+  );
 
   checkWrap(req);
 });

test/internet/test-dns-ipv6.js

@@ -1,14 +1,14 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    dns = require('dns'),
+const dns = require('dns');
-    net = require('net'),
+const net = require('net');
-    isIPv6 = net.isIPv6;
+const isIPv6 = net.isIPv6;
 
-var expected = 0,
+let expected = 0;
-    completed = 0,
+let completed = 0;
-    running = false,
+let running = false;
-    queue = [];
+const queue = [];
 
 if (!common.hasIPv6) {
   console.log('1..0 # Skipped: this test, no IPv6 support');
@@ -156,7 +156,9 @@ TEST(function test_lookup_ip_ipv6(done) {
 });
 
 TEST(function test_lookup_all_ipv6(done) {
-  var req = dns.lookup('www.google.com', {all: true, family: 6},
+  var req = dns.lookup(
+    'www.google.com',
+    {all: true, family: 6},
     function(err, ips) {
       if (err) throw err;
       assert.ok(Array.isArray(ips));
@@ -169,7 +171,8 @@ TEST(function test_lookup_all_ipv6(done) {
       });
 
       done();
-  });
+    }
+  );
 
   checkWrap(req);
 });

test/internet/test-dns.js

@@ -1,16 +1,16 @@
 'use strict';
 require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    dns = require('dns'),
+const dns = require('dns');
-    net = require('net'),
+const net = require('net');
-    isIPv4 = net.isIPv4,
+const isIPv4 = net.isIPv4;
-    isIPv6 = net.isIPv6;
+const isIPv6 = net.isIPv6;
-var util = require('util');
+const util = require('util');
 
-var expected = 0,
+let expected = 0;
-    completed = 0,
+let completed = 0;
-    running = false,
+let running = false;
-    queue = [];
+const queue = [];
 
 
 function TEST(f) {

test/parallel/test-bad-unicode.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    exception = null;
+let exception = null;
 
 try {
   eval('"\\uc/ef"');

test/parallel/test-buffer.js

@@ -921,8 +921,8 @@ Buffer(Buffer(0), 0, 0);
 
 // GH-5110
 (function() {
-  var buffer = new Buffer('test'),
+  const buffer = new Buffer('test');
-      string = JSON.stringify(buffer);
+  const string = JSON.stringify(buffer);
 
   assert.equal(string, '{"type":"Buffer","data":[116,101,115,116]}');
 

test/parallel/test-child-process-double-pipe.js

@@ -1,9 +1,9 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    os = require('os'),
+const os = require('os');
-    util = require('util'),
+const util = require('util');
-    spawn = require('child_process').spawn;
+const spawn = require('child_process').spawn;
 
 // We're trying to reproduce:
 // $ echo "hello\nnode\nand\nworld" | grep o | sed s/o/a/

test/parallel/test-child-process-fork-close.js

@@ -1,13 +1,13 @@
 'use strict';
-var assert = require('assert'),
+const assert = require('assert');
-    common = require('../common'),
+const common = require('../common');
-    fork = require('child_process').fork;
+const fork = require('child_process').fork;
 
 var cp = fork(common.fixturesDir + '/child-process-message-and-exit.js');
 
-var gotMessage = false,
+let gotMessage = false;
-    gotExit = false,
+let gotExit = false;
-    gotClose = false;
+let gotClose = false;
 
 cp.on('message', function(message) {
   assert(!gotMessage);

test/parallel/test-child-process-fork-dgram.js

@@ -69,7 +69,13 @@ if (process.argv[2] === 'child') {
 
   var sendMessages = function() {
     var timer = setInterval(function() {
-      client.send(msg, 0, msg.length, common.PORT, '127.0.0.1', function(err) {
+      client.send(
+        msg,
+        0,
+        msg.length,
+        common.PORT,
+        '127.0.0.1',
+        function(err) {
           if (err) throw err;
         }
       );

test/parallel/test-child-process-fork-net2.js

@@ -66,8 +66,8 @@ if (process.argv[2] === 'child') {
 
   var server = net.createServer();
 
-  var connected = 0,
+  let connected = 0;
-      closed = 0;
+  let closed = 0;
   server.on('connection', function(socket) {
     switch (connected % 6) {
       case 0:

test/parallel/test-cli-eval.js

@@ -5,11 +5,11 @@ if (module.parent) {
   process.exit(42);
 }
 
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    child = require('child_process'),
+const child = require('child_process');
-    path = require('path'),
+const path = require('path');
-    nodejs = '"' + process.execPath + '"';
+const nodejs = '"' + process.execPath + '"';
 
 
 // replace \ by / because windows uses backslashes in paths, but they're still

test/parallel/test-cluster-worker-exit.js

@@ -103,8 +103,8 @@ if (cluster.isWorker) {
 
 function checkResults(expected_results, results) {
   for (var k in expected_results) {
-    var actual = results[k],
+    const actual = results[k];
-        expected = expected_results[k];
+    const expected = expected_results[k];
 
     var msg = (expected[1] || '') +
         (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');

test/parallel/test-cluster-worker-kill.js

@@ -103,8 +103,8 @@ if (cluster.isWorker) {
 
 function checkResults(expected_results, results) {
   for (var k in expected_results) {
-    var actual = results[k],
+    const actual = results[k];
-        expected = expected_results[k];
+    const expected = expected_results[k];
 
     var msg = (expected[1] || '') +
         (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');

test/parallel/test-crypto-padding.js

@@ -15,11 +15,11 @@ crypto.DEFAULT_ENCODING = 'buffer';
  * Input data
  */
 
-var ODD_LENGTH_PLAIN = 'Hello node world!',
+const ODD_LENGTH_PLAIN = 'Hello node world!';
-    EVEN_LENGTH_PLAIN = 'Hello node world!AbC09876dDeFgHi';
+const EVEN_LENGTH_PLAIN = 'Hello node world!AbC09876dDeFgHi';
 
-var KEY_PLAIN = 'S3c.r.e.t.K.e.Y!',
+const KEY_PLAIN = 'S3c.r.e.t.K.e.Y!';
-    IV_PLAIN = 'blahFizz2011Buzz';
+const IV_PLAIN = 'blahFizz2011Buzz';
 
 var CIPHER_NAME = 'aes-128-cbc';
 

test/parallel/test-crypto-stream.js

@@ -43,11 +43,11 @@ if (!common.hasFipsCrypto) {
 }
 
 // Decipher._flush() should emit an error event, not an exception.
-var key = new Buffer('48fb56eb10ffeb13fc0ef551bbca3b1b', 'hex'),
+const key = new Buffer('48fb56eb10ffeb13fc0ef551bbca3b1b', 'hex');
-    badkey = new Buffer('12341234123412341234123412341234', 'hex'),
+const badkey = new Buffer('12341234123412341234123412341234', 'hex');
-    iv = new Buffer('6d358219d1f488f5f4eb12820a66d146', 'hex'),
+const iv = new Buffer('6d358219d1f488f5f4eb12820a66d146', 'hex');
-    cipher = crypto.createCipheriv('aes-128-cbc', key, iv),
+const cipher = crypto.createCipheriv('aes-128-cbc', key, iv);
-    decipher = crypto.createDecipheriv('aes-128-cbc', badkey, iv);
+const decipher = crypto.createDecipheriv('aes-128-cbc', badkey, iv);
 
 cipher.pipe(decipher)
   .on('error', common.mustCall(function end(err) {

test/parallel/test-dgram-bytes-length.js

@@ -5,8 +5,14 @@ var dgram = require('dgram');
 
 var message = new Buffer('Some bytes');
 var client = dgram.createSocket('udp4');
-client.send(message, 0, message.length, 41234, 'localhost',
+client.send(
+  message,
+  0,
+  message.length,
+  41234,
+  'localhost',
   function(err, bytes) {
     assert.strictEqual(bytes, message.length);
     client.close();
-});
+  }
+);

test/parallel/test-dgram-close.js

@@ -2,9 +2,9 @@
 // Ensure that if a dgram socket is closed before the DNS lookup completes, it
 // won't crash.
 
-var assert = require('assert'),
+const assert = require('assert');
-    common = require('../common'),
+const common = require('../common');
-    dgram = require('dgram');
+const dgram = require('dgram');
 
 var buf = new Buffer(1024);
 buf.fill(42);

test/parallel/test-dgram-multicast-setTTL.js

@@ -1,9 +1,9 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    dgram = require('dgram'),
+const dgram = require('dgram');
-    thrown = false,
+const socket = dgram.createSocket('udp4');
-    socket = dgram.createSocket('udp4');
+let thrown = false;
 
 socket.bind(common.PORT);
 socket.on('listening', function() {

test/parallel/test-dgram-udp4.js

@@ -1,11 +1,11 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const dgram = require('dgram');
-var dgram = require('dgram'), server, client,
+const server_port = common.PORT;
-    server_port = common.PORT,
+const message_to_send = 'A message to send';
-    message_to_send = 'A message to send',
+let server, client;
-    timer;
+let timer;
 
 server = dgram.createSocket('udp4');
 server.on('message', function(msg, rinfo) {
@@ -28,13 +28,19 @@ server.on('listening', function() {
     client.close();
     server.close();
   });
-  client.send(message_to_send, 0, message_to_send.length,
+  client.send(
-              server_port, 'localhost', function(err) {
+    message_to_send,
+    0,
+    message_to_send.length,
+    server_port,
+    'localhost',
+    function(err) {
       if (err) {
         console.log('Caught error in client send.');
         throw err;
       }
-      });
+    }
+  );
   client.on('close',
             function() {
               if (server.fd === null) {

test/parallel/test-event-emitter-num-args.js

@@ -3,8 +3,8 @@ require('../common');
 var assert = require('assert');
 var events = require('events');
 
-var e = new events.EventEmitter(),
+const e = new events.EventEmitter();
-    num_args_emited = [];
+const num_args_emited = [];
 
 e.on('numArgs', function() {
   var numArgs = arguments.length;

test/parallel/test-file-write-stream3.js

@@ -1,16 +1,15 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const path = require('path');
-var path = require('path'),
+const fs = require('fs');
-    fs = require('fs');
 
 
 var filepath = path.join(common.tmpDir, 'write_pos.txt');
 
 
-var cb_expected = 'write open close write open close write open close ',
+const cb_expected = 'write open close write open close write open close ';
-    cb_occurred = '';
+let cb_occurred = '';
 
 var fileDataInitial = 'abcdefghijklmnopqrstuvwxyz';
 
@@ -126,8 +125,8 @@ function run_test_2() {
 function run_test_3() {
   var file, options;
 
-  var data = '\u2026\u2026',    // 3 bytes * 2 = 6 bytes in UTF-8
+  const data = '\u2026\u2026';    // 3 bytes * 2 = 6 bytes in UTF-8
-      fileData;
+  let fileData;
 
   options = { start: 10,
               flags: 'r+' };

test/parallel/test-fs-chmod.js

@@ -51,8 +51,8 @@ if (common.isWindows) {
   mode_sync = 0o644;
 }
 
-var file1 = path.join(common.fixturesDir, 'a.js'),
+const file1 = path.join(common.fixturesDir, 'a.js');
-    file2 = path.join(common.fixturesDir, 'a1.js');
+const file2 = path.join(common.fixturesDir, 'a1.js');
 
 fs.chmod(file1, mode_async.toString(8), function(err) {
   if (err) {

test/parallel/test-fs-error-messages.js

@@ -1,14 +1,13 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const path = require('path');
-var path = require('path'),
+const fs = require('fs');
-    fs = require('fs'),
+const fn = path.join(common.fixturesDir, 'non-existent');
-    fn = path.join(common.fixturesDir, 'non-existent'),
+const existingFile = path.join(common.fixturesDir, 'exit.js');
-    existingFile = path.join(common.fixturesDir, 'exit.js'),
+const existingFile2 = path.join(common.fixturesDir, 'create-file.js');
-    existingFile2 = path.join(common.fixturesDir, 'create-file.js'),
+const existingDir = path.join(common.fixturesDir, 'empty');
-    existingDir = path.join(common.fixturesDir, 'empty'),
+const existingDir2 = path.join(common.fixturesDir, 'keys');
-    existingDir2 = path.join(common.fixturesDir, 'keys');
 
 // ASYNC_CALL
 
@@ -78,8 +77,8 @@ fs.readFile(fn, function(err) {
 
 // Sync
 
-var errors = [],
+const errors = [];
-    expected = 0;
+let expected = 0;
 
 try {
   ++expected;

test/parallel/test-fs-open-flags.js

@@ -29,7 +29,8 @@ assert.equal(fs._stringToFlags('xa'), O_APPEND | O_CREAT | O_WRONLY | O_EXCL);
 assert.equal(fs._stringToFlags('ax+'), O_APPEND | O_CREAT | O_RDWR | O_EXCL);
 assert.equal(fs._stringToFlags('xa+'), O_APPEND | O_CREAT | O_RDWR | O_EXCL);
 
-('+ +a +r +w rw wa war raw r++ a++ w++' +
+('+ +a +r +w rw wa war raw r++ a++ w++ x +x x+ rx rx+ wxx wax xwx xxx')
- 'x +x x+ rx rx+ wxx wax xwx xxx').split(' ').forEach(function(flags) {
+  .split(' ')
+  .forEach(function(flags) {
     assert.throws(function() { fs._stringToFlags(flags); });
   });

test/parallel/test-fs-read-buffer.js

@@ -1,15 +1,15 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-var path = require('path'),
+const path = require('path');
-    Buffer = require('buffer').Buffer,
+const Buffer = require('buffer').Buffer;
-    fs = require('fs'),
+const fs = require('fs');
-    filepath = path.join(common.fixturesDir, 'x.txt'),
+const filepath = path.join(common.fixturesDir, 'x.txt');
-    fd = fs.openSync(filepath, 'r'),
+const fd = fs.openSync(filepath, 'r');
-    expected = 'xyz\n',
+const expected = 'xyz\n';
-    bufferAsync = new Buffer(expected.length),
+const bufferAsync = new Buffer(expected.length);
-    bufferSync = new Buffer(expected.length),
+const bufferSync = new Buffer(expected.length);
-    readCalled = 0;
+let readCalled = 0;
 
 fs.read(fd, bufferAsync, 0, expected.length, 0, function(err, bytesRead) {
   readCalled++;

test/parallel/test-fs-read.js

@@ -1,12 +1,12 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-var path = require('path'),
+const path = require('path');
-    fs = require('fs'),
+const fs = require('fs');
-    filepath = path.join(common.fixturesDir, 'x.txt'),
+const filepath = path.join(common.fixturesDir, 'x.txt');
-    fd = fs.openSync(filepath, 'r'),
+const fd = fs.openSync(filepath, 'r');
-    expected = 'xyz\n',
+const expected = 'xyz\n';
-    readCalled = 0;
+let readCalled = 0;
 
 fs.read(fd, expected.length, 0, 'utf-8', function(err, str, bytesRead) {
   readCalled++;

test/parallel/test-fs-readfile-empty.js

@@ -1,10 +1,9 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const path = require('path');
-var path = require('path'),
+const fs = require('fs');
-    fs = require('fs'),
+const fn = path.join(common.fixturesDir, 'empty.txt');
-    fn = path.join(common.fixturesDir, 'empty.txt');
 
 fs.readFile(fn, function(err, data) {
   assert.ok(data);

test/parallel/test-fs-readfile-fd.js

@@ -1,10 +1,9 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const path = require('path');
-var path = require('path'),
+const fs = require('fs');
-    fs = require('fs'),
+const fn = path.join(common.fixturesDir, 'empty.txt');
-    fn = path.join(common.fixturesDir, 'empty.txt');
 
 tempFd(function(fd, close) {
   fs.readFile(fd, function(err, data) {

test/parallel/test-fs-readfile-unlink.js

@@ -1,10 +1,10 @@
 'use strict';
-var assert = require('assert'),
+const assert = require('assert');
-    common = require('../common'),
+const common = require('../common');
-    fs = require('fs'),
+const fs = require('fs');
-    path = require('path'),
+const path = require('path');
-    dirName = path.resolve(common.fixturesDir, 'test-readfile-unlink'),
+const dirName = path.resolve(common.fixturesDir, 'test-readfile-unlink');
-    fileName = path.resolve(dirName, 'test.bin');
+const fileName = path.resolve(dirName, 'test.bin');
 
 var buf = new Buffer(512 * 1024);
 buf.fill(42);

test/parallel/test-fs-realpath.js

@@ -85,8 +85,8 @@ function test_simple_relative_symlink(callback) {
     console.log('1..0 # Skipped: symlink test (no privs)');
     return runNextTest();
   }
-  var entry = common.tmpDir + '/symlink',
+  const entry = common.tmpDir + '/symlink';
-      expected = common.tmpDir + '/cycles/root.js';
+  const expected = common.tmpDir + '/cycles/root.js';
   [
     [entry, '../' + common.tmpDirName + '/cycles/root.js']
   ].forEach(function(t) {
@@ -111,8 +111,8 @@ function test_simple_absolute_symlink(callback) {
 
   console.log('using type=%s', type);
 
-  var entry = tmpAbsDir + '/symlink',
+  const entry = tmpAbsDir + '/symlink';
-      expected = common.fixturesDir + '/nested-index/one';
+  const expected = common.fixturesDir + '/nested-index/one';
   [
     [entry, expected]
   ].forEach(function(t) {
@@ -490,8 +490,8 @@ function test_lying_cache_liar(cb) {
   });
   assert(called === false);
 
-  var test = path.resolve('/a/b/c/d'),
+  const test = path.resolve('/a/b/c/d');
-      expect = path.resolve('/a/b/d');
+  const expect = path.resolve('/a/b/d');
   var actual = fs.realpathSync(test, cache);
   assert.equal(expect, actual);
   fs.realpath(test, cache, function(er, actual) {

test/parallel/test-fs-write-buffer.js

@@ -1,13 +1,13 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-var path = require('path'),
+const path = require('path');
-    Buffer = require('buffer').Buffer,
+const Buffer = require('buffer').Buffer;
-    fs = require('fs'),
+const fs = require('fs');
-    filename = path.join(common.tmpDir, 'write.txt'),
+const filename = path.join(common.tmpDir, 'write.txt');
-    expected = new Buffer('hello'),
+const expected = new Buffer('hello');
-    openCalled = 0,
+let openCalled = 0;
-    writeCalled = 0;
+let writeCalled = 0;
 
 
 common.refreshTmpDir();

test/parallel/test-fs-write-stream-change-open.js

@@ -1,17 +1,16 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const path = require('path');
-var path = require('path'),
+const fs = require('fs');
-    fs = require('fs');
 
 var file = path.join(common.tmpDir, 'write.txt');
 
 common.refreshTmpDir();
 
-var stream = fs.WriteStream(file),
+const stream = fs.WriteStream(file);
-    _fs_close = fs.close,
+const _fs_close = fs.close;
-    _fs_open = fs.open;
+const _fs_open = fs.open;
 
 // change the fs.open with an identical function after the WriteStream
 // has pushed it onto its internal action queue, but before it's

test/parallel/test-fs-write-stream.js

@@ -1,17 +1,16 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const path = require('path');
-var path = require('path'),
+const fs = require('fs');
-    fs = require('fs');
 
 var file = path.join(common.tmpDir, 'write.txt');
 
 common.refreshTmpDir();
 
 (function() {
-  var stream = fs.WriteStream(file),
+  const stream = fs.WriteStream(file);
-      _fs_close = fs.close;
+  const _fs_close = fs.close;
 
   fs.close = function(fd) {
     assert.ok(fd, 'fs.close must not be called without an undefined fd.');

test/parallel/test-global.js

@@ -11,8 +11,8 @@ assert.equal('foo', global.baseFoo, 'x -> global.x in base level not working');
 
 assert.equal('bar', baseBar, 'global.x -> x in base level not working');
 
-var module = require('../fixtures/global/plain'),
+var module = require('../fixtures/global/plain');
-    fooBar = module.fooBar;
+const fooBar = module.fooBar;
 
 assert.equal('foo', fooBar.foo, 'x -> global.x in sub level not working');
 

test/parallel/test-http-abort-queued.js

@@ -1,7 +1,7 @@
 'use strict';
-var assert = require('assert'),
+const assert = require('assert');
-    common = require('../common'),
+const common = require('../common');
-    http = require('http');
+const http = require('http');
 
 var complete;
 

test/parallel/test-http-client-response-domain.js

@@ -1,8 +1,8 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    http = require('http'),
+const http = require('http');
-    domain = require('domain');
+const domain = require('domain');
 
 var gotDomainError = false;
 var d;

test/parallel/test-http-client-timeout-agent.js

@@ -15,8 +15,8 @@ var options = {
 //http.globalAgent.maxSockets = 15;
 
 var server = http.createServer(function(req, res) {
-  var m = /\/(.*)/.exec(req.url),
+  const m = /\/(.*)/.exec(req.url);
-      reqid = parseInt(m[1], 10);
+  const reqid = parseInt(m[1], 10);
   if ( reqid % 2 ) {
     // do not reply the request
   } else {

test/parallel/test-http-default-port.js

@@ -1,19 +1,19 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var http = require('http'),
+const http = require('http');
-    PORT = common.PORT,
+const PORT = common.PORT;
-    SSLPORT = common.PORT + 1,
+const SSLPORT = common.PORT + 1;
-    assert = require('assert'),
+const assert = require('assert');
-    hostExpect = 'localhost',
+const hostExpect = 'localhost';
-    fs = require('fs'),
+const fs = require('fs');
-    path = require('path'),
+const path = require('path');
-    fixtures = path.resolve(__dirname, '../fixtures/keys'),
+const fixtures = path.resolve(__dirname, '../fixtures/keys');
-    options = {
+const options = {
   key: fs.readFileSync(fixtures + '/agent1-key.pem'),
   cert: fs.readFileSync(fixtures + '/agent1-cert.pem')
-    },
+};
-    gotHttpsResp = false,
+let gotHttpsResp = false;
-    gotHttpResp = false;
+let gotHttpResp = false;
 
 if (common.hasCrypto) {
   var https = require('https');

test/parallel/test-http-header-response-splitting.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    http = require('http');
+const http = require('http');
 
 var testIndex = 0;
 const testCount = 2 * 4 * 6;

test/parallel/test-http-host-headers.js

@@ -1,8 +1,8 @@
 'use strict';
-var http = require('http'),
+const http = require('http');
-    common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    httpServer = http.createServer(reqHandler);
+const httpServer = http.createServer(reqHandler);
 
 function reqHandler(req, res) {
   console.log('Got request: ' + req.headers.host + ' ' + req.url);

test/parallel/test-http-localaddress.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var http = require('http'),
+const http = require('http');
-    assert = require('assert');
+const assert = require('assert');
 
 if (!common.hasMultiLocalhost()) {
   console.log('1..0 # Skipped: platform-specific test.');

test/parallel/test-http-parser.js

@@ -333,8 +333,8 @@ function expectBody(expected) {
     assert.equal(versionMinor, 1);
   };
 
-  var body_part = 0,
+  let body_part = 0;
-      body_parts = ['123', '123456', '1234567890'];
+  const body_parts = ['123', '123456', '1234567890'];
 
   var onBody = function(buf, start, len) {
     var body = '' + buf.slice(start, start + len);
@@ -371,8 +371,8 @@ function expectBody(expected) {
     assert.equal(versionMinor, 1);
   };
 
-  var body_part = 0,
+  let body_part = 0;
-      body_parts =
+  const body_parts =
           ['123', '123456', '123456789', '123456789ABC', '123456789ABCDEF'];
 
   var onBody = function(buf, start, len) {

test/parallel/test-http-timeout.js

@@ -23,7 +23,8 @@ server.listen(port, function() {
   var count = 0;
 
   function createRequest() {
-    var req = http.request({port: port, path: '/', agent: agent},
+    const req = http.request(
+      {port: port, path: '/', agent: agent},
       function(res) {
         req.clearTimeout(callback);
 
@@ -36,7 +37,8 @@ server.listen(port, function() {
         });
 
         res.resume();
-    });
+      }
+    );
 
     req.setTimeout(1000, callback);
     return req;

test/parallel/test-https-host-headers.js

@@ -8,12 +8,12 @@ if (!common.hasCrypto) {
 }
 var https = require('https');
 
-var fs = require('fs'),
+const fs = require('fs');
-    options = {
+const options = {
   key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
   cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
-    },
+};
-    httpsServer = https.createServer(options, reqHandler);
+const httpsServer = https.createServer(options, reqHandler);
 
 function reqHandler(req, res) {
   console.log('Got request: ' + req.headers.host + ' ' + req.url);

test/parallel/test-https-localaddress.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    fs = require('fs'),
+const fs = require('fs');
-    assert = require('assert');
+const assert = require('assert');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');

test/parallel/test-net-listen-port-option.js

@@ -14,7 +14,8 @@ net.Server().listen({ port: '' + common.PORT }, close);
   1 / 0,
   -1 / 0,
   '+Infinity',
-  '-Infinity' ].forEach(function(port) {
+  '-Infinity'
+].forEach(function(port) {
   assert.throws(function() {
     net.Server().listen({ port: port }, assert.fail);
   }, /"port" option should be >= 0 and < 65536/i);

test/parallel/test-net-pause-resume-connecting.js

@@ -1,11 +1,11 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    net = require('net');
+const net = require('net');
 
-var connections = 0,
+let connections = 0;
-    dataEvents = 0,
+let dataEvents = 0;
-    conn;
+let conn;
 
 
 // Server

test/parallel/test-next-tick-errors.js

@@ -2,8 +2,8 @@
 require('../common');
 var assert = require('assert');
 
-var order = [],
+const order = [];
-    exceptionHandled = false;
+let exceptionHandled = false;
 
 // This nextTick function will throw an error.  It should only be called once.
 // When it throws an error, it should still get removed from the queue.

test/parallel/test-preload.js

@@ -1,8 +1,8 @@
 'use strict';
 require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    path = require('path'),
+const path = require('path');
-    child_process = require('child_process');
+const child_process = require('child_process');
 
 var nodeBinary = process.argv[0];
 

test/parallel/test-promises-unhandled-rejections.js

@@ -234,15 +234,18 @@ asyncTest('When re-throwing new errors in a promise catch, only the re-thrown' +
   var promise2;
 });
 
-asyncTest('unhandledRejection should not be triggered if a promise catch is' +
+asyncTest(
+  'unhandledRejection should not be triggered if a promise catch is' +
   ' attached synchronously upon the promise\'s creation',
   function(done) {
     var e = new Error();
     onUnhandledFail(done);
     Promise.reject(e).then(common.fail, function() {});
-});
+  }
+);
 
-asyncTest('unhandledRejection should not be triggered if a promise catch is' +
+asyncTest(
+  'unhandledRejection should not be triggered if a promise catch is' +
   ' attached synchronously upon the promise\'s creation',
   function(done) {
     var e = new Error();
@@ -250,7 +253,8 @@ asyncTest('unhandledRejection should not be triggered if a promise catch is' +
     new Promise(function(_, reject) {
       reject(e);
     }).then(common.fail, function() {});
-});
+  }
+);
 
 asyncTest('Attaching a promise catch in a process.nextTick is soon enough to' +
           ' prevent unhandledRejection', function(done) {
@@ -360,7 +364,8 @@ asyncTest('A rejected promise derived from throwing in a fulfillment handler' +
   });
 });
 
-asyncTest('A rejected promise derived from returning a synchronously-rejected' +
+asyncTest(
+  'A rejected promise derived from returning a synchronously-rejected' +
   ' promise in a fulfillment handler does trigger unhandledRejection',
   function(done) {
     var e = new Error();
@@ -372,7 +377,8 @@ asyncTest('A rejected promise derived from returning a synchronously-rejected' +
     _promise = Promise.resolve().then(function() {
       return Promise.reject(e);
     });
-});
+  }
+);
 
 // Combinations with Promise.all
 asyncTest('Catching the Promise.all() of a collection that includes a' +
@@ -382,7 +388,8 @@ asyncTest('Catching the Promise.all() of a collection that includes a' +
   Promise.all([Promise.reject(e)]).then(common.fail, function() {});
 });
 
-asyncTest('Catching the Promise.all() of a collection that includes a ' +
+asyncTest(
+  'Catching the Promise.all() of a collection that includes a ' +
   'nextTick-async rejected promise prevents unhandledRejection',
   function(done) {
     var e = new Error();
@@ -396,7 +403,8 @@ asyncTest('Catching the Promise.all() of a collection that includes a ' +
     process.nextTick(function() {
       p.then(common.fail, function() {});
     });
-});
+  }
+);
 
 asyncTest('Failing to catch the Promise.all() of a collection that includes' +
           ' a rejected promise triggers unhandledRejection for the returned' +
@@ -513,7 +521,8 @@ asyncTest('Waiting for some combination of promise microtasks + ' +
   });
 });
 
-asyncTest('Waiting for some combination of promise microtasks +' +
+asyncTest(
+  'Waiting for some combination of promise microtasks +' +
   ' process.nextTick to attach a catch handler is still soon enough' +
   ' to prevent unhandledRejection: inside setImmediate',
   function(done) {
@@ -532,7 +541,8 @@ asyncTest('Waiting for some combination of promise microtasks +' +
         });
       });
     });
-});
+  }
+);
 
 asyncTest('Waiting for some combination of promise microtasks +' +
           ' process.nextTick to attach a catch handler is still soon enough' +
@@ -612,7 +622,8 @@ asyncTest('setImmediate + promise microtasks is too late to attach a catch' +
   });
 });
 
-asyncTest('Promise unhandledRejection handler does not interfere with domain' +
+asyncTest(
+  'Promise unhandledRejection handler does not interfere with domain' +
   ' error handlers being given exceptions thrown from nextTick.',
   function(done) {
     var d = domain.create();
@@ -633,7 +644,8 @@ asyncTest('Promise unhandledRejection handler does not interfere with domain' +
         throw domainError;
       });
     });
-});
+  }
+);
 
 asyncTest('nextTick is immediately scheduled when called inside an event' +
           ' handler', function(done) {

test/parallel/test-querystring.js

@@ -182,12 +182,11 @@ assert.equal(
 
 // Test removing limit
 function testUnlimitedKeys() {
-  var query = {},
+  const query = {};
-      url;
 
   for (var i = 0; i < 2000; i++) query[i] = i;
 
-  url = qs.stringify(query);
+  const url = qs.stringify(query);
 
   assert.equal(
       Object.keys(qs.parse(url, null, null, { maxKeys: 0 })).length,

test/parallel/test-regress-GH-7511.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    vm     = require('vm');
+const vm = require('vm');
 
 assert.doesNotThrow(function() {
   var context = vm.createContext({ process: process });

test/parallel/test-repl-console.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    repl = require('repl');
+const repl = require('repl');
 
 // Create a dummy stream that does nothing
 const stream = new common.ArrayStream();

test/parallel/test-repl-definecommand.js

@@ -2,9 +2,9 @@
 
 require('../common');
 
-const stream = require('stream'),
+const stream = require('stream');
-      assert = require('assert'),
+const assert = require('assert');
-      repl = require('repl');
+const repl = require('repl');
 
 var output = '';
 const inputStream = new stream.PassThrough();

test/parallel/test-repl-end-emits-exit.js

@@ -1,9 +1,9 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    repl = require('repl'),
+const repl = require('repl');
-    terminalExit = 0,
+let terminalExit = 0;
-    regularExit = 0;
+let regularExit = 0;
 
 // Create a dummy stream that does nothing
 const stream = new common.ArrayStream();

test/parallel/test-repl-envvars.js

@@ -8,7 +8,8 @@ const REPL = require('internal/repl');
 const assert = require('assert');
 const inspect = require('util').inspect;
 
-const tests = [{
+const tests = [
+  {
     env: {},
     expected: { terminal: true, useColors: true }
   },
@@ -31,7 +32,8 @@ const tests = [{
   {
     env: { NODE_NO_READLINE: '0' },
     expected: { terminal: true, useColors: true }
-}];
+  }
+];
 
 function run(test) {
   const env = test.env;

test/parallel/test-repl-options.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    repl = require('repl');
+const repl = require('repl');
 
 common.globalCheck = false;
 

test/parallel/test-repl-persistent-history.js

@@ -79,7 +79,8 @@ const enoentHistoryPath = path.join(fixtures, 'enoent-repl-history-file.json');
 const emptyHistoryPath = path.join(fixtures, '.empty-repl-history-file');
 const defaultHistoryPath = path.join(common.tmpDir, '.node_repl_history');
 
-const tests = [{
+const tests = [
+  {
     env: { NODE_REPL_HISTORY: '' },
     test: [UP],
     expected: [prompt, replDisabled, prompt]
@@ -179,7 +180,8 @@ const tests = [{
     env: {},
     test: [UP],
     expected: [prompt, homedirErr, prompt, replDisabled, prompt]
-}];
+  }
+];
 const numtests = tests.length;
 
 

test/parallel/test-repl-require-cache.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    repl = require('repl');
+const repl = require('repl');
 
 // https://github.com/joyent/node/issues/3226
 

test/parallel/test-repl.js

@@ -5,17 +5,17 @@ var assert = require('assert');
 common.globalCheck = false;
 common.refreshTmpDir();
 
-var net = require('net'),
+const net = require('net');
-    repl = require('repl'),
+const repl = require('repl');
-    message = 'Read, Eval, Print Loop',
+const message = 'Read, Eval, Print Loop';
-    prompt_unix = 'node via Unix socket> ',
+const prompt_unix = 'node via Unix socket> ';
-    prompt_tcp = 'node via TCP socket> ',
+const prompt_tcp = 'node via TCP socket> ';
-    prompt_multiline = '... ',
+const prompt_multiline = '... ';
-    prompt_npm = 'npm should be run outside of the ' +
+const prompt_npm = 'npm should be run outside of the ' +
                    'node repl, in your normal shell.\n' +
-                 '(Press Control-D to exit.)\n',
+                   '(Press Control-D to exit.)\n';
-    expect_npm = prompt_npm + prompt_unix,
+const expect_npm = prompt_npm + prompt_unix;
-    server_tcp, server_unix, client_tcp, client_unix, timer;
+var server_tcp, server_unix, client_tcp, client_unix, timer;
 
 
 // absolute path to test/fixtures/a.js

test/parallel/test-signal-handler.js

@@ -10,8 +10,8 @@ if (common.isWindows) {
 
 console.log('process.pid: ' + process.pid);
 
-var first = 0,
+let first = 0;
-    second = 0;
+let second = 0;
 
 var sighup = false;
 

test/parallel/test-timers-immediate.js

@@ -2,10 +2,10 @@
 require('../common');
 var assert = require('assert');
 
-var immediateA = false,
+let immediateA = false;
-    immediateB = false,
+let immediateB = false;
-    immediateC = [],
+let immediateC = [];
-    before;
+let before;
 
 setImmediate(function() {
   try {

test/parallel/test-timers-this.js

@@ -2,8 +2,8 @@
 require('../common');
 var assert = require('assert');
 
-var immediateThis, intervalThis, timeoutThis,
+let immediateThis, intervalThis, timeoutThis;
-    immediateArgsThis, intervalArgsThis, timeoutArgsThis;
+let immediateArgsThis, intervalArgsThis, timeoutArgsThis;
 
 var immediateHandler = setImmediate(function() {
   immediateThis = this;

test/parallel/test-timers-unref.js

@@ -2,12 +2,12 @@
 require('../common');
 var assert = require('assert');
 
-var interval_fired = false,
+let interval_fired = false;
-    timeout_fired = false,
+let timeout_fired = false;
-    unref_interval = false,
+let unref_interval = false;
-    unref_timer = false,
+let unref_timer = false;
-    unref_callbacks = 0,
+let unref_callbacks = 0;
-    interval, check_unref, checks = 0;
+let interval, check_unref, checks = 0;
 
 var LONG_TIME = 10 * 1000;
 var SHORT_TIME = 100;

test/parallel/test-tls-connect-stream-writes.js

@@ -1,16 +1,15 @@
 'use strict';
-var assert = require('assert'),
+const common = require('../common');
-    fs = require('fs'),
+const assert = require('assert');
-    path = require('path'),
+const fs = require('fs');
-    tls = require('tls'),
+const path = require('path');
-    stream = require('stream'),
+const tls = require('tls');
-    net = require('net');
+const stream = require('stream');
-
+const net = require('net');
-var common = require('../common');
 
 var server;
-var cert_dir = path.resolve(__dirname, '../fixtures'),
+var cert_dir = path.resolve(__dirname, '../fixtures');
-    options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
+var options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
                 cert: fs.readFileSync(cert_dir + '/test_cert.pem'),
                 ca: [ fs.readFileSync(cert_dir + '/test_ca.pem') ],
                 ciphers: 'AES256-GCM-SHA384' };

test/parallel/test-tls-npn-server-client.js

@@ -5,9 +5,9 @@ if (!process.features.tls_npn) {
   return;
 }
 
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    fs = require('fs');
+const fs = require('fs');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
@@ -69,8 +69,8 @@ var clientsOptions = [{
   rejectUnauthorized: false
 }];
 
-var serverResults = [],
+const serverResults = [];
-    clientsResults = [];
+const clientsResults = [];
 
 var server = tls.createServer(serverOptions, function(c) {
   serverResults.push(c.npnProtocol);

test/parallel/test-tls-server-verify.js

@@ -87,8 +87,7 @@ var testCases =
       renegotiate: false,
       CAs: ['ca2-cert'],
       crl: 'ca2-crl',
-      clients:
+      clients: [
-       [
         { name: 'agent1', shouldReject: true, shouldAuth: false },
         { name: 'agent2', shouldReject: true, shouldAuth: false },
         { name: 'agent3', shouldReject: false, shouldAuth: true },

test/parallel/test-tls-sni-option.js

@@ -5,9 +5,9 @@ if (!process.features.tls_sni) {
   return;
 }
 
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    fs = require('fs');
+const fs = require('fs');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
@@ -99,12 +99,12 @@ var clientsOptions = [{
   rejectUnauthorized: false
 }];
 
-var serverResults = [],
+const serverResults = [];
-    clientResults = [],
+const clientResults = [];
-    serverErrors = [],
+const serverErrors = [];
-    clientErrors = [],
+const clientErrors = [];
-    serverError,
+let serverError;
-    clientError;
+let clientError;
 
 var server = tls.createServer(serverOptions, function(c) {
   serverResults.push({ sni: c.servername, authorized: c.authorized });

test/parallel/test-tls-sni-server-client.js

@@ -5,9 +5,9 @@ if (!process.features.tls_sni) {
   return;
 }
 
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    fs = require('fs');
+const fs = require('fs');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
@@ -73,8 +73,8 @@ var clientsOptions = [{
   rejectUnauthorized: false
 }];
 
-var serverResults = [],
+const serverResults = [];
-    clientResults = [];
+const clientResults = [];
 
 var server = tls.createServer(serverOptions, function(c) {
   serverResults.push(c.servername);

test/parallel/test-url.js

@@ -870,7 +870,7 @@ for (var u in parseTests) {
   assert.deepEqual(actual, expected);
   assert.deepEqual(spaced, expected);
 
-  var expected = parseTests[u].href,
+  expected = parseTests[u].href;
   actual = url.format(parseTests[u]);
 
   assert.equal(actual, expected,
@@ -1194,8 +1194,8 @@ var relativeTests = [
   ['http://localhost', 'file://foo/Users', 'file://foo/Users']
 ];
 relativeTests.forEach(function(relativeTest) {
-  var a = url.resolve(relativeTest[0], relativeTest[1]),
+  const a = url.resolve(relativeTest[0], relativeTest[1]);
-      e = relativeTest[2];
+  const e = relativeTest[2];
   assert.equal(a, e,
                'resolve(' + [relativeTest[0], relativeTest[1]] + ') == ' + e +
                '\n  actual=' + a);
@@ -1504,8 +1504,8 @@ var relativeTests2 = [
    'http://diff:auth@www.example.com/']
 ];
 relativeTests2.forEach(function(relativeTest) {
-  var a = url.resolve(relativeTest[1], relativeTest[0]),
+  const a = url.resolve(relativeTest[1], relativeTest[0]);
-      e = relativeTest[2];
+  const e = relativeTest[2];
   assert.equal(a, e,
                'resolve(' + [relativeTest[1], relativeTest[0]] + ') == ' + e +
                '\n  actual=' + a);
@@ -1516,8 +1516,8 @@ relativeTests2.forEach(function(relativeTest) {
 
 //format: [from, path, expected]
 relativeTests.forEach(function(relativeTest) {
-  var actual = url.resolveObject(url.parse(relativeTest[0]), relativeTest[1]),
+  var actual = url.resolveObject(url.parse(relativeTest[0]), relativeTest[1]);
-      expected = url.parse(relativeTest[2]);
+  var expected = url.parse(relativeTest[2]);
 
 
   assert.deepEqual(actual, expected);
@@ -1544,12 +1544,12 @@ if (relativeTests2[181][0] === './/g' &&
   relativeTests2.splice(181, 1);
 }
 relativeTests2.forEach(function(relativeTest) {
-  var actual = url.resolveObject(url.parse(relativeTest[1]), relativeTest[0]),
+  var actual = url.resolveObject(url.parse(relativeTest[1]), relativeTest[0]);
-      expected = url.parse(relativeTest[2]);
+  var expected = url.parse(relativeTest[2]);
 
   assert.deepEqual(actual, expected);
 
-  var expected = relativeTest[2],
+  expected = relativeTest[2];
   actual = url.format(actual);
 
   assert.equal(actual, expected,

test/parallel/test-util-log.js

@@ -28,9 +28,9 @@ var tests = [
 // test util.log()
 tests.forEach(function(test) {
   util.log(test.input);
-  var result = strings.shift().trim(),
+  const result = strings.shift().trim();
-      re = (/[0-9]{1,2} [A-Z][a-z]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} - (.+)$/),
+  const re = (/[0-9]{1,2} [A-Z][a-z]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} - (.+)$/);
-      match = re.exec(result);
+  const match = re.exec(result);
   assert.ok(match);
   assert.equal(match[1], test.output);
 });

test/parallel/test-zlib-flush.js

@@ -5,18 +5,18 @@ var zlib = require('zlib');
 var path = require('path');
 var fs = require('fs');
 
-var file = fs.readFileSync(path.resolve(common.fixturesDir, 'person.jpg')),
+const file = fs.readFileSync(path.resolve(common.fixturesDir, 'person.jpg'));
-    chunkSize = 16,
+const chunkSize = 16;
-    opts = { level: 0 },
+const opts = { level: 0 };
-    deflater = zlib.createDeflate(opts);
+const deflater = zlib.createDeflate(opts);
 
-var chunk = file.slice(0, chunkSize),
+const chunk = file.slice(0, chunkSize);
-    expectedNone = new Buffer([0x78, 0x01]),
+const expectedNone = new Buffer([0x78, 0x01]);
-    blkhdr = new Buffer([0x00, 0x10, 0x00, 0xef, 0xff]),
+const blkhdr = new Buffer([0x00, 0x10, 0x00, 0xef, 0xff]);
-    adler32 = new Buffer([0x00, 0x00, 0x00, 0xff, 0xff]),
+const adler32 = new Buffer([0x00, 0x00, 0x00, 0xff, 0xff]);
-    expectedFull = Buffer.concat([blkhdr, chunk, adler32]),
+const expectedFull = Buffer.concat([blkhdr, chunk, adler32]);
-    actualNone,
+let actualNone;
-    actualFull;
+let actualFull;
 
 deflater.write(chunk, function() {
   deflater.flush(zlib.Z_NO_FLUSH, function() {

test/parallel/test-zlib-invalid-input.js

@@ -2,8 +2,8 @@
 // test uncompressing invalid input
 
 require('../common');
-var assert = require('assert'),
+const assert = require('assert');
-    zlib = require('zlib');
+const zlib = require('zlib');
 
 var nonStringInputs = [1, true, {a: 1}, ['a']];
 

test/parallel/test-zlib-params.js

@@ -5,16 +5,16 @@ var zlib = require('zlib');
 var path = require('path');
 var fs = require('fs');
 
-var file = fs.readFileSync(path.resolve(common.fixturesDir, 'person.jpg')),
+const file = fs.readFileSync(path.resolve(common.fixturesDir, 'person.jpg'));
-    chunkSize = 24 * 1024,
+const chunkSize = 24 * 1024;
-    opts = { level: 9, strategy: zlib.Z_DEFAULT_STRATEGY },
+const opts = { level: 9, strategy: zlib.Z_DEFAULT_STRATEGY };
-    deflater = zlib.createDeflate(opts);
+const deflater = zlib.createDeflate(opts);
 
-var chunk1 = file.slice(0, chunkSize),
+const chunk1 = file.slice(0, chunkSize);
-    chunk2 = file.slice(chunkSize),
+const chunk2 = file.slice(chunkSize);
-    blkhdr = new Buffer([0x00, 0x48, 0x82, 0xb7, 0x7d]),
+const blkhdr = new Buffer([0x00, 0x48, 0x82, 0xb7, 0x7d]);
-    expected = Buffer.concat([blkhdr, chunk2]),
+const expected = Buffer.concat([blkhdr, chunk2]);
-    actual;
+let actual;
 
 deflater.write(chunk1, function() {
   deflater.params(0, zlib.Z_DEFAULT_STRATEGY, function() {

test/pummel/test-dh-regr.js

@@ -11,8 +11,8 @@ var crypto = require('crypto');
 var p = crypto.createDiffieHellman(1024).getPrime();
 
 for (var i = 0; i < 2000; i++) {
-  var a = crypto.createDiffieHellman(p),
+  const a = crypto.createDiffieHellman(p);
-      b = crypto.createDiffieHellman(p);
+  const b = crypto.createDiffieHellman(p);
 
   a.generateKeys();
   b.generateKeys();

test/pummel/test-exec.js

@@ -17,7 +17,8 @@ var success_count = 0;
 var error_count = 0;
 
 
-exec('"' + process.execPath + '" -p -e process.versions',
+exec(
+  '"' + process.execPath + '" -p -e process.versions',
   function(err, stdout, stderr) {
     if (err) {
       error_count++;
@@ -29,7 +30,8 @@ exec('"' + process.execPath + '" -p -e process.versions',
       success_count++;
       console.dir(stdout);
     }
-});
+  }
+);
 
 
 exec('thisisnotavalidcommand', function(err, stdout, stderr) {

test/pummel/test-http-client-reconnect-bug.js

@@ -1,9 +1,8 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
-
+const net = require('net');
-var net = require('net'),
+const http = require('http');
-    http = require('http');
 
 var errorCount = 0;
 var eofCount = 0;

test/pummel/test-http-upload-timeout.js

@@ -2,10 +2,10 @@
 // This tests setTimeout() by having multiple clients connecting and sending
 // data in random intervals. Clients are also randomly disconnecting until there
 // are no more clients left. If no false timeout occurs, this test has passed.
-var common = require('../common'),
+const common = require('../common');
-    http = require('http'),
+const http = require('http');
-    server = http.createServer(),
+const server = http.createServer();
-    connections = 0;
+let connections = 0;
 
 server.on('request', function(req, res) {
   req.socket.setTimeout(1000);

test/sequential/test-child-process-execsync.js

@@ -12,8 +12,7 @@ var start = Date.now();
 var err;
 var caught = false;
 
-try
+try {
-{
   var cmd = `"${process.execPath}" -e "setTimeout(function(){}, ${SLEEP});"`;
   var ret = execSync(cmd, {timeout: TIMER});
 } catch (e) {

test/sequential/test-dgram-pingpong.js

@@ -34,8 +34,8 @@ function pingPongTest(port, host) {
   server.on('listening', function() {
     console.log('server listening on ' + port + ' ' + host);
 
-    var buf = new Buffer('PING'),
+    const buf = new Buffer('PING');
-        client = dgram.createSocket('udp4');
+    const client = dgram.createSocket('udp4');
 
     client.on('message', function(msg, rinfo) {
       if (debug) console.log('client got: ' + msg +

test/sequential/test-init.js

@@ -1,9 +1,9 @@
 'use strict';
 (function() {
-  var assert = require('assert'),
+  const assert = require('assert');
-      child = require('child_process'),
+  const child = require('child_process');
-      util = require('util'),
+  const util = require('util');
-      common = require('../common');
+  const common = require('../common');
   if (process.env['TEST_INIT']) {
     util.print('Loaded successfully!');
   } else {

test/sequential/test-module-loading.js

@@ -57,14 +57,14 @@ assert.equal('D', d4.D());
 assert.ok((new a.SomeClass()) instanceof c.SomeClass);
 
 console.error('test index.js modules ids and relative loading');
-var one = require('../fixtures/nested-index/one'),
+const one = require('../fixtures/nested-index/one');
-    two = require('../fixtures/nested-index/two');
+const two = require('../fixtures/nested-index/two');
 assert.notEqual(one.hello, two.hello);
 
 console.error('test index.js in a folder with a trailing slash');
-var three = require('../fixtures/nested-index/three'),
+const three = require('../fixtures/nested-index/three');
-    threeFolder = require('../fixtures/nested-index/three/'),
+const threeFolder = require('../fixtures/nested-index/three/');
-    threeIndex = require('../fixtures/nested-index/three/index.js');
+const threeIndex = require('../fixtures/nested-index/three/index.js');
 assert.equal(threeFolder, threeIndex);
 assert.notEqual(threeFolder, three);
 
@@ -75,8 +75,8 @@ assert.equal(require('../fixtures/packages/main-index').ok, 'ok',
              'Failed loading package with index.js in main subdir');
 
 console.error('test cycles containing a .. path');
-var root = require('../fixtures/cycles/root'),
+const root = require('../fixtures/cycles/root');
-    foo = require('../fixtures/cycles/folder/foo');
+const foo = require('../fixtures/cycles/folder/foo');
 assert.equal(root.foo, foo);
 assert.equal(root.sayHello(), root.hello);
 
@@ -137,8 +137,8 @@ try {
 // Check load order is as expected
 console.error('load order');
 
-var loadOrder = '../fixtures/module-load-order/',
+const loadOrder = '../fixtures/module-load-order/';
-    msg = 'Load order incorrect.';
+const msg = 'Load order incorrect.';
 
 require.extensions['.reg'] = require.extensions['.js'];
 require.extensions['.reg2'] = require.extensions['.js'];

test/sequential/test-regress-GH-1697.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
-var net = require('net'),
+const net = require('net');
-    cp = require('child_process');
+const cp = require('child_process');
 
 if (process.argv[2] === 'server') {
   // Server
@@ -30,8 +30,8 @@ if (process.argv[2] === 'server') {
   serverProcess.stdout.once('data', function() {
     var client = net.createConnection(common.PORT, '127.0.0.1');
     client.on('connect', function() {
-      var alot = new Buffer(1024),
+      const alot = new Buffer(1024);
-          alittle = new Buffer(1);
+      const alittle = new Buffer(1);
 
       for (var i = 0; i < 100; i++) {
         client.write(alot);

test/sequential/test-regress-GH-3542.js

@@ -1,9 +1,9 @@
 'use strict';
-var common = require('../common'),
+const common = require('../common');
-    assert = require('assert'),
+const assert = require('assert');
-    fs = require('fs'),
+const fs = require('fs');
-    path = require('path'),
+const path = require('path');
-    succeeded = 0;
+let succeeded = 0;
 
 // This test is only relevant on Windows.
 if (!common.isWindows) {