From dba3dc523cf2929c9c7ca91ec51835c9434b086d Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 29 Dec 2015 18:56:29 -0800
Subject: [PATCH 01/11] test: remove unused modules

Many tests use require() to import modules that subsequently never gets
used. This removes those imports and, in a few cases, removes other
unused variables from tests.

PR-URL: https://github.com/nodejs/node/pull/4684
Reviewed-By: Myles Borins <mborins@us.ibm.com>
---
 test/addons/at-exit/test.js                            |  2 +-
 test/internet/test-dns-ipv4.js                         |  2 --
 test/internet/test-dns-ipv6.js                         |  2 --
 test/message/2100bytes.js                              |  1 -
 test/parallel/test-cluster-eaddrinuse.js               |  1 -
 test/parallel/test-cluster-worker-forced-exit.js       |  1 -
 test/parallel/test-crypto-certificate.js               |  1 -
 .../parallel/test-dgram-send-callback-buffer-length.js |  2 --
 test/parallel/test-dgram-udp4.js                       |  3 +--
 test/parallel/test-domain-multi.js                     |  1 -
 test/parallel/test-eval-require.js                     |  2 --
 .../test-event-emitter-listeners-side-effects.js       |  1 -
 test/parallel/test-fs-readdir.js                       |  1 -
 test/parallel/test-listen-fd-cluster.js                |  1 -
 test/parallel/test-listen-fd-server.js                 |  1 -
 test/parallel/test-readline-keys.js                    |  3 +--
 test/parallel/test-tls-legacy-onselect.js              | 10 ----------
 test/parallel/test-zlib-dictionary.js                  |  1 -
 test/parallel/test-zlib-flush-drain.js                 |  1 -
 test/parallel/test-zlib-write-after-flush.js           |  1 -
 test/pummel/test-dtrace-jsstack.js                     |  3 ---
 test/pummel/test-http-client-reconnect-bug.js          |  1 -
 test/pummel/test-keep-alive.js                         |  1 -
 test/pummel/test-timer-wrap2.js                        |  3 +--
 test/pummel/test-tls-securepair-client.js              |  4 ----
 test/sequential/test-child-process-execsync.js         |  1 -
 test/sequential/test-regress-GH-1697.js                |  3 +--
 test/sequential/test-stdout-close-catch.js             |  1 -
 28 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/test/addons/at-exit/test.js b/test/addons/at-exit/test.js
index 32264a6604eeb6..c94453cb3b05a4 100644
--- a/test/addons/at-exit/test.js
+++ b/test/addons/at-exit/test.js
@@ -1,3 +1,3 @@
 'use strict';
 require('../../common');
-var binding = require('./build/Release/binding');
+require('./build/Release/binding');
diff --git a/test/internet/test-dns-ipv4.js b/test/internet/test-dns-ipv4.js
index 04befca6370e1e..bdca60d1b4fd5d 100644
--- a/test/internet/test-dns-ipv4.js
+++ b/test/internet/test-dns-ipv4.js
@@ -3,9 +3,7 @@ var common = require('../common');
 var assert = require('assert'),
     dns = require('dns'),
     net = require('net'),
-    isIP = net.isIP,
     isIPv4 = net.isIPv4;
-var util = require('util');
 
 var expected = 0,
     completed = 0,
diff --git a/test/internet/test-dns-ipv6.js b/test/internet/test-dns-ipv6.js
index 27547edcd84b46..d7c50a1e86b656 100644
--- a/test/internet/test-dns-ipv6.js
+++ b/test/internet/test-dns-ipv6.js
@@ -3,9 +3,7 @@ var common = require('../common');
 var assert = require('assert'),
     dns = require('dns'),
     net = require('net'),
-    isIP = net.isIP,
     isIPv6 = net.isIPv6;
-var util = require('util');
 
 var expected = 0,
     completed = 0,
diff --git a/test/message/2100bytes.js b/test/message/2100bytes.js
index 03aca7a6626bce..0f696806be03fe 100644
--- a/test/message/2100bytes.js
+++ b/test/message/2100bytes.js
@@ -1,6 +1,5 @@
 'use strict';
 require('../common');
-var util = require('util');
 
 console.log([
   '_______________________________________________50',
diff --git a/test/parallel/test-cluster-eaddrinuse.js b/test/parallel/test-cluster-eaddrinuse.js
index 6ff68252d9d867..3821551f00a32c 100644
--- a/test/parallel/test-cluster-eaddrinuse.js
+++ b/test/parallel/test-cluster-eaddrinuse.js
@@ -5,7 +5,6 @@
 
 var common = require('../common');
 var assert = require('assert');
-var cluster = require('cluster');
 var fork = require('child_process').fork;
 var net = require('net');
 
diff --git a/test/parallel/test-cluster-worker-forced-exit.js b/test/parallel/test-cluster-worker-forced-exit.js
index 76f5cc69a9f716..ef9f7728bad3a2 100644
--- a/test/parallel/test-cluster-worker-forced-exit.js
+++ b/test/parallel/test-cluster-worker-forced-exit.js
@@ -2,7 +2,6 @@
 require('../common');
 var assert = require('assert');
 var cluster = require('cluster');
-var net = require('net');
 
 var SENTINEL = 42;
 
diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
index 8286d58d1e44ca..9814b395552e9f 100644
--- a/test/parallel/test-crypto-certificate.js
+++ b/test/parallel/test-crypto-certificate.js
@@ -11,7 +11,6 @@ var crypto = require('crypto');
 crypto.DEFAULT_ENCODING = 'buffer';
 
 var fs = require('fs');
-var path = require('path');
 
 // Test Certificates
 var spkacValid = fs.readFileSync(common.fixturesDir + '/spkac.valid');
diff --git a/test/parallel/test-dgram-send-callback-buffer-length.js b/test/parallel/test-dgram-send-callback-buffer-length.js
index a34c5e2eb6b8db..80c2d23e42ef55 100644
--- a/test/parallel/test-dgram-send-callback-buffer-length.js
+++ b/test/parallel/test-dgram-send-callback-buffer-length.js
@@ -2,9 +2,7 @@
 var common = require('../common');
 var assert = require('assert');
 
-var fs = require('fs');
 var dgram = require('dgram');
-var callbacks = 0;
 var client, timer, buf, len, offset;
 
 
diff --git a/test/parallel/test-dgram-udp4.js b/test/parallel/test-dgram-udp4.js
index 5b1ede414eb1a1..58c8b69839ffe6 100644
--- a/test/parallel/test-dgram-udp4.js
+++ b/test/parallel/test-dgram-udp4.js
@@ -2,8 +2,7 @@
 var common = require('../common');
 var assert = require('assert');
 
-var fs = require('fs'),
-    dgram = require('dgram'), server, client,
+var dgram = require('dgram'), server, client,
     server_port = common.PORT,
     message_to_send = 'A message to send',
     timer;
diff --git a/test/parallel/test-domain-multi.js b/test/parallel/test-domain-multi.js
index e5f9f6748b178e..ac01d66deee544 100644
--- a/test/parallel/test-domain-multi.js
+++ b/test/parallel/test-domain-multi.js
@@ -4,7 +4,6 @@
 var common = require('../common');
 var assert = require('assert');
 var domain = require('domain');
-var events = require('events');
 
 var caughtA = false;
 var caughtB = false;
diff --git a/test/parallel/test-eval-require.js b/test/parallel/test-eval-require.js
index f966b5a98c80ba..4e2ddf42b6dffa 100644
--- a/test/parallel/test-eval-require.js
+++ b/test/parallel/test-eval-require.js
@@ -2,8 +2,6 @@
 var common = require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
-var path = require('path');
-var fs = require('fs');
 
 var options = {
   cwd: common.fixturesDir
diff --git a/test/parallel/test-event-emitter-listeners-side-effects.js b/test/parallel/test-event-emitter-listeners-side-effects.js
index 8f40d88f34486e..5b9f2f3ddf0f41 100644
--- a/test/parallel/test-event-emitter-listeners-side-effects.js
+++ b/test/parallel/test-event-emitter-listeners-side-effects.js
@@ -2,7 +2,6 @@
 
 require('../common');
 var assert = require('assert');
-var events = require('events');
 
 var EventEmitter = require('events').EventEmitter;
 var assert = require('assert');
diff --git a/test/parallel/test-fs-readdir.js b/test/parallel/test-fs-readdir.js
index b08f42b5c23f85..9a9b85ecaccd2c 100644
--- a/test/parallel/test-fs-readdir.js
+++ b/test/parallel/test-fs-readdir.js
@@ -2,7 +2,6 @@
 
 const common = require('../common');
 const assert = require('assert');
-const path = require('path');
 const fs = require('fs');
 
 const readdirDir = common.tmpDir;
diff --git a/test/parallel/test-listen-fd-cluster.js b/test/parallel/test-listen-fd-cluster.js
index f6d00c72a0f78c..c321f699d7a89d 100644
--- a/test/parallel/test-listen-fd-cluster.js
+++ b/test/parallel/test-listen-fd-cluster.js
@@ -4,7 +4,6 @@ var assert = require('assert');
 var http = require('http');
 var net = require('net');
 var PORT = common.PORT;
-var spawn = require('child_process').spawn;
 var cluster = require('cluster');
 
 console.error('Cluster listen fd test', process.argv[2] || 'runner');
diff --git a/test/parallel/test-listen-fd-server.js b/test/parallel/test-listen-fd-server.js
index d51d51ee8eb4de..3e0fa521f75334 100644
--- a/test/parallel/test-listen-fd-server.js
+++ b/test/parallel/test-listen-fd-server.js
@@ -4,7 +4,6 @@ var assert = require('assert');
 var http = require('http');
 var net = require('net');
 var PORT = common.PORT;
-var spawn = require('child_process').spawn;
 
 if (common.isWindows) {
   console.log('1..0 # Skipped: This test is disabled on windows.');
diff --git a/test/parallel/test-readline-keys.js b/test/parallel/test-readline-keys.js
index 5cac38a1d7db42..e026c0b583cd9e 100644
--- a/test/parallel/test-readline-keys.js
+++ b/test/parallel/test-readline-keys.js
@@ -1,6 +1,5 @@
 'use strict';
 require('../common');
-var EventEmitter = require('events').EventEmitter;
 var PassThrough = require('stream').PassThrough;
 var assert = require('assert');
 var inherits = require('util').inherits;
@@ -16,7 +15,7 @@ inherits(FakeInput, PassThrough);
 
 var fi = new FakeInput();
 var fo = new FakeInput();
-var rli = new Interface({ input: fi, output: fo, terminal: true });
+new Interface({ input: fi, output: fo, terminal: true });
 
 var keys = [];
 fi.on('keypress', function(s, k) {
diff --git a/test/parallel/test-tls-legacy-onselect.js b/test/parallel/test-tls-legacy-onselect.js
index 6f1e9a91a8344c..d3b20d5d8a4cef 100644
--- a/test/parallel/test-tls-legacy-onselect.js
+++ b/test/parallel/test-tls-legacy-onselect.js
@@ -9,18 +9,8 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 var net = require('net');
 
-var fs = require('fs');
-
 var success = false;
 
-function filenamePEM(n) {
-  return require('path').join(common.fixturesDir, 'keys', n + '.pem');
-}
-
-function loadPEM(n) {
-  return fs.readFileSync(filenamePEM(n));
-}
-
 var server = net.Server(function(raw) {
   var pair = tls.createSecurePair(null, true, false, false);
   pair.on('error', function() {});
diff --git a/test/parallel/test-zlib-dictionary.js b/test/parallel/test-zlib-dictionary.js
index d190ff51a57e63..f8ce5bfbe87df4 100644
--- a/test/parallel/test-zlib-dictionary.js
+++ b/test/parallel/test-zlib-dictionary.js
@@ -4,7 +4,6 @@
 require('../common');
 const assert = require('assert');
 const zlib = require('zlib');
-const path = require('path');
 
 var spdyDict = new Buffer([
   'optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-',
diff --git a/test/parallel/test-zlib-flush-drain.js b/test/parallel/test-zlib-flush-drain.js
index 26285c04739a25..f04dac9f0699ac 100644
--- a/test/parallel/test-zlib-flush-drain.js
+++ b/test/parallel/test-zlib-flush-drain.js
@@ -2,7 +2,6 @@
 require('../common');
 const assert = require('assert');
 const zlib = require('zlib');
-const path = require('path');
 
 const bigData = new Buffer(10240).fill('x');
 
diff --git a/test/parallel/test-zlib-write-after-flush.js b/test/parallel/test-zlib-write-after-flush.js
index 53fa715a673f7e..fa70c5f14dee6c 100644
--- a/test/parallel/test-zlib-write-after-flush.js
+++ b/test/parallel/test-zlib-write-after-flush.js
@@ -2,7 +2,6 @@
 require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
-var fs = require('fs');
 
 var gzip = zlib.createGzip();
 var gunz = zlib.createUnzip();
diff --git a/test/pummel/test-dtrace-jsstack.js b/test/pummel/test-dtrace-jsstack.js
index 513cbeb0ee7f96..b558dd28020c07 100644
--- a/test/pummel/test-dtrace-jsstack.js
+++ b/test/pummel/test-dtrace-jsstack.js
@@ -2,7 +2,6 @@
 require('../common');
 var assert = require('assert');
 var os = require('os');
-var util = require('util');
 
 if (os.type() != 'SunOS') {
   console.log('1..0 # Skipped: no DTRACE support');
@@ -13,7 +12,6 @@ if (os.type() != 'SunOS') {
  * Some functions to create a recognizable stack.
  */
 var frames = [ 'stalloogle', 'bagnoogle', 'doogle' ];
-var expected;
 
 var stalloogle = function(str) {
   expected = str;
@@ -35,7 +33,6 @@ var doogle = function() {
 
 var spawn = require('child_process').spawn;
 var prefix = '/var/tmp/node';
-var corefile = prefix + '.' + process.pid;
 
 /*
  * We're going to use DTrace to stop us, gcore us, and set us running again
diff --git a/test/pummel/test-http-client-reconnect-bug.js b/test/pummel/test-http-client-reconnect-bug.js
index bd852e45f19410..12a6fecc7050e8 100644
--- a/test/pummel/test-http-client-reconnect-bug.js
+++ b/test/pummel/test-http-client-reconnect-bug.js
@@ -3,7 +3,6 @@ var common = require('../common');
 var assert = require('assert');
 
 var net = require('net'),
-    util = require('util'),
     http = require('http');
 
 var errorCount = 0;
diff --git a/test/pummel/test-keep-alive.js b/test/pummel/test-keep-alive.js
index c2ec7fd81f1691..46190555b27263 100644
--- a/test/pummel/test-keep-alive.js
+++ b/test/pummel/test-keep-alive.js
@@ -5,7 +5,6 @@ var common = require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
 var http = require('http');
-var path = require('path');
 var url = require('url');
 
 if (common.isWindows) {
diff --git a/test/pummel/test-timer-wrap2.js b/test/pummel/test-timer-wrap2.js
index 9f62bd95d01974..87497b2685f5d3 100644
--- a/test/pummel/test-timer-wrap2.js
+++ b/test/pummel/test-timer-wrap2.js
@@ -1,9 +1,8 @@
 'use strict';
 require('../common');
-var assert = require('assert');
 
 // Test that allocating a timer does not increase the loop's reference
 // count.
 
 var Timer = process.binding('timer_wrap').Timer;
-var t = new Timer();
+new Timer();
diff --git a/test/pummel/test-tls-securepair-client.js b/test/pummel/test-tls-securepair-client.js
index aaf8e628d6a2bc..3d33ef8f21623f 100644
--- a/test/pummel/test-tls-securepair-client.js
+++ b/test/pummel/test-tls-securepair-client.js
@@ -17,9 +17,7 @@ var join = require('path').join;
 var net = require('net');
 var assert = require('assert');
 var fs = require('fs');
-var crypto = require('crypto');
 var tls = require('tls');
-var exec = require('child_process').exec;
 var spawn = require('child_process').spawn;
 
 test1();
@@ -47,8 +45,6 @@ function test(keyfn, certfn, check, next) {
   // EADDRINUSE.
   var PORT = common.PORT + 5;
 
-  var connections = 0;
-
   keyfn = join(common.fixturesDir, keyfn);
   var key = fs.readFileSync(keyfn).toString();
 
diff --git a/test/sequential/test-child-process-execsync.js b/test/sequential/test-child-process-execsync.js
index 0bc4e02c65edb8..205485c9ebbc48 100644
--- a/test/sequential/test-child-process-execsync.js
+++ b/test/sequential/test-child-process-execsync.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common');
 var assert = require('assert');
-var os = require('os');
 
 var execSync = require('child_process').execSync;
 var execFileSync = require('child_process').execFileSync;
diff --git a/test/sequential/test-regress-GH-1697.js b/test/sequential/test-regress-GH-1697.js
index ff5754f357dfc1..ba7f90ecf00951 100644
--- a/test/sequential/test-regress-GH-1697.js
+++ b/test/sequential/test-regress-GH-1697.js
@@ -1,8 +1,7 @@
 'use strict';
 var common = require('../common');
 var net = require('net'),
-    cp = require('child_process'),
-    util = require('util');
+    cp = require('child_process');
 
 if (process.argv[2] === 'server') {
   // Server
diff --git a/test/sequential/test-stdout-close-catch.js b/test/sequential/test-stdout-close-catch.js
index f0ecf9a7c4b725..470fa9843cb9de 100644
--- a/test/sequential/test-stdout-close-catch.js
+++ b/test/sequential/test-stdout-close-catch.js
@@ -3,7 +3,6 @@ var common = require('../common');
 var assert = require('assert');
 var path = require('path');
 var child_process = require('child_process');
-var fs = require('fs');
 
 var testScript = path.join(common.fixturesDir, 'catch-stdout-error.js');
 

From 46e3fd6494fbc1105eee502952a44caf5311f6ae Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 23 Dec 2015 01:15:44 -0800
Subject: [PATCH 02/11] lib: remove unused modules

Some files in `lib` were using `require` to load modules that were
subsequently not used in the file. This removes those `require`
statements.

PR-URL: https://github.com/nodejs/node/pull/4683
Reviewed-By: Myles Borins <mborins@us.ibm.com>
---
 lib/_http_client.js | 1 -
 lib/os.js           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/_http_client.js b/lib/_http_client.js
index aef05eb8fa2299..db1db7bcc3ab60 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -3,7 +3,6 @@
 const util = require('util');
 const net = require('net');
 const url = require('url');
-const EventEmitter = require('events');
 const HTTPParser = process.binding('http_parser').HTTPParser;
 const assert = require('assert').ok;
 const common = require('_http_common');
diff --git a/lib/os.js b/lib/os.js
index 2d537f53840a35..ddf7cee9d48791 100644
--- a/lib/os.js
+++ b/lib/os.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const binding = process.binding('os');
-const util = require('util');
 const internalUtil = require('internal/util');
 const isWindows = process.platform === 'win32';
 

From 7894f19c4d63780c302718c2a5f7e334e71731c2 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 26 Dec 2015 22:08:08 -0800
Subject: [PATCH 03/11] test: remove unused vars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove unused vars in tests

PR-URL: https://github.com/nodejs/node/pull/4536
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 test/addons/repl-domain-abort/test.js           | 2 +-
 test/debugger/test-debugger-pid.js              | 9 +--------
 test/debugger/test-debugger-remote.js           | 2 --
 test/internet/test-dns.js                       | 5 ++---
 test/parallel/test-domain-exit-dispose-again.js | 2 +-
 test/parallel/test-domain-implicit-fs.js        | 1 -
 test/parallel/test-vm-create-context-arg.js     | 6 +++---
 test/parallel/test-vm-harmony-proxies.js        | 4 ++--
 test/parallel/test-vm-harmony-symbols.js        | 4 ++--
 test/parallel/test-vm-new-script-new-context.js | 3 ++-
 test/parallel/test-vm-run-in-new-context.js     | 2 ++
 test/parallel/test-vm-static-this.js            | 2 ++
 test/pummel/test-dtrace-jsstack.js              | 1 -
 test/pummel/test-fs-watch-file.js               | 1 -
 test/pummel/test-https-no-reader.js             | 3 ---
 test/pummel/test-regress-GH-892.js              | 4 ----
 test/pummel/test-stream2-basic.js               | 2 --
 test/pummel/test-timers.js                      | 6 +++---
 test/pummel/test-watch-file.js                  | 1 -
 test/sequential/test-pump-file2tcp.js           | 1 -
 test/sequential/test-stream2-fs.js              | 2 --
 test/sequential/test-tcp-wrap-listen.js         | 2 +-
 test/timers/test-timers-reliability.js          | 2 +-
 23 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/test/addons/repl-domain-abort/test.js b/test/addons/repl-domain-abort/test.js
index bbd0c737eeba49..5591b4f2b38e90 100644
--- a/test/addons/repl-domain-abort/test.js
+++ b/test/addons/repl-domain-abort/test.js
@@ -46,4 +46,4 @@ var options = {
 };
 
 // Run commands from fake REPL.
-var dummy = repl.start(options);
+repl.start(options);
diff --git a/test/debugger/test-debugger-pid.js b/test/debugger/test-debugger-pid.js
index 14a281ab3ce4cc..6a977d7cfa72e8 100644
--- a/test/debugger/test-debugger-pid.js
+++ b/test/debugger/test-debugger-pid.js
@@ -1,16 +1,9 @@
 'use strict';
-var common = require('../common');
+require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
 
-var port = common.PORT + 1337;
 var buffer = '';
-var expected = [];
-var scriptToDebug = common.fixturesDir + '/empty.js';
-
-function fail() {
-  assert(0); // `--debug-brk script.js` should not quit
-}
 
 // connect to debug agent
 var interfacer = spawn(process.execPath, ['debug', '-p', '655555']);
diff --git a/test/debugger/test-debugger-remote.js b/test/debugger/test-debugger-remote.js
index 81ed8b41ab0198..f5232dce9c8df4 100644
--- a/test/debugger/test-debugger-remote.js
+++ b/test/debugger/test-debugger-remote.js
@@ -3,9 +3,7 @@ var common = require('../common');
 var assert = require('assert');
 var spawn = require('child_process').spawn;
 
-var port = common.PORT + 1337;
 var buffer = '';
-var expected = [];
 var scriptToDebug = common.fixturesDir + '/empty.js';
 
 function fail() {
diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js
index 5c89021c030b19..6448ad7c76b07b 100644
--- a/test/internet/test-dns.js
+++ b/test/internet/test-dns.js
@@ -3,7 +3,6 @@ require('../common');
 var assert = require('assert'),
     dns = require('dns'),
     net = require('net'),
-    isIP = net.isIP,
     isIPv4 = net.isIPv4,
     isIPv6 = net.isIPv6;
 var util = require('util');
@@ -48,7 +47,7 @@ TEST(function test_reverse_bogus(done) {
   var error;
 
   try {
-    var req = dns.reverse('bogus ip', function() {
+    dns.reverse('bogus ip', function() {
       assert.ok(false);
     });
   } catch (e) {
@@ -369,7 +368,7 @@ console.log('looking up nodejs.org...');
 
 var cares = process.binding('cares_wrap');
 var req = new cares.GetAddrInfoReqWrap();
-var err = cares.getaddrinfo(req, 'nodejs.org', 4);
+cares.getaddrinfo(req, 'nodejs.org', 4);
 
 req.oncomplete = function(err, domains) {
   assert.strictEqual(err, 0);
diff --git a/test/parallel/test-domain-exit-dispose-again.js b/test/parallel/test-domain-exit-dispose-again.js
index 3cae101fd69c39..e5b1affc0afb55 100644
--- a/test/parallel/test-domain-exit-dispose-again.js
+++ b/test/parallel/test-domain-exit-dispose-again.js
@@ -5,7 +5,7 @@
 // to that domain, including those whose callbacks are called from within
 // the same invocation of listOnTimeout, _are_ called.
 
-var common = require('../common');
+require('../common');
 var assert = require('assert');
 var domain = require('domain');
 var disposalFailed = false;
diff --git a/test/parallel/test-domain-implicit-fs.js b/test/parallel/test-domain-implicit-fs.js
index f35647b525c5c7..a5bbb83bd62d53 100644
--- a/test/parallel/test-domain-implicit-fs.js
+++ b/test/parallel/test-domain-implicit-fs.js
@@ -4,7 +4,6 @@
 require('../common');
 var assert = require('assert');
 var domain = require('domain');
-var events = require('events');
 var caught = 0;
 var expectCaught = 1;
 
diff --git a/test/parallel/test-vm-create-context-arg.js b/test/parallel/test-vm-create-context-arg.js
index d569ce1089c386..a0c29762330133 100644
--- a/test/parallel/test-vm-create-context-arg.js
+++ b/test/parallel/test-vm-create-context-arg.js
@@ -4,12 +4,12 @@ var assert = require('assert');
 var vm = require('vm');
 
 assert.throws(function() {
-  var ctx = vm.createContext('string is not supported');
+  vm.createContext('string is not supported');
 }, TypeError);
 
 assert.doesNotThrow(function() {
-  var ctx = vm.createContext({ a: 1 });
-  ctx = vm.createContext([0, 1, 2, 3]);
+  vm.createContext({ a: 1 });
+  vm.createContext([0, 1, 2, 3]);
 });
 
 assert.doesNotThrow(function() {
diff --git a/test/parallel/test-vm-harmony-proxies.js b/test/parallel/test-vm-harmony-proxies.js
index 15a58b2a4dacd4..78ee144582741a 100644
--- a/test/parallel/test-vm-harmony-proxies.js
+++ b/test/parallel/test-vm-harmony-proxies.js
@@ -8,12 +8,12 @@ var vm = require('vm');
 // src/node_contextify.cc filters out the Proxy object from the parent
 // context.  Make sure that the new context has a Proxy object of its own.
 var sandbox = {};
-var result = vm.runInNewContext('this.Proxy = Proxy', sandbox);
+vm.runInNewContext('this.Proxy = Proxy', sandbox);
 assert(typeof sandbox.Proxy === 'object');
 assert(sandbox.Proxy !== Proxy);
 
 // Unless we copy the Proxy object explicitly, of course.
 var sandbox = { Proxy: Proxy };
-var result = vm.runInNewContext('this.Proxy = Proxy', sandbox);
+vm.runInNewContext('this.Proxy = Proxy', sandbox);
 assert(typeof sandbox.Proxy === 'object');
 assert(sandbox.Proxy === Proxy);
diff --git a/test/parallel/test-vm-harmony-symbols.js b/test/parallel/test-vm-harmony-symbols.js
index efd15327c5fa07..e4b27c9ebb8579 100644
--- a/test/parallel/test-vm-harmony-symbols.js
+++ b/test/parallel/test-vm-harmony-symbols.js
@@ -5,12 +5,12 @@ var vm = require('vm');
 
 // The sandbox should have its own Symbol constructor.
 var sandbox = {};
-var result = vm.runInNewContext('this.Symbol = Symbol', sandbox);
+vm.runInNewContext('this.Symbol = Symbol', sandbox);
 assert(typeof sandbox.Symbol === 'function');
 assert(sandbox.Symbol !== Symbol);
 
 // Unless we copy the Symbol constructor explicitly, of course.
 var sandbox = { Symbol: Symbol };
-var result = vm.runInNewContext('this.Symbol = Symbol', sandbox);
+vm.runInNewContext('this.Symbol = Symbol', sandbox);
 assert(typeof sandbox.Symbol === 'function');
 assert(sandbox.Symbol === Symbol);
diff --git a/test/parallel/test-vm-new-script-new-context.js b/test/parallel/test-vm-new-script-new-context.js
index e3cc6e91cb432a..81f9b57593ea2f 100644
--- a/test/parallel/test-vm-new-script-new-context.js
+++ b/test/parallel/test-vm-new-script-new-context.js
@@ -21,7 +21,6 @@ assert.throws(function() {
 
 
 console.error('undefined reference');
-var error;
 script = new Script('foo.bar = 5;');
 assert.throws(function() {
   script.runInNewContext();
@@ -41,7 +40,9 @@ code = 'foo = 1;' +
 foo = 2;
 obj = { foo: 0, baz: 3 };
 script = new Script(code);
+/* eslint-disable no-unused-vars */
 var baz = script.runInNewContext(obj);
+/* eslint-enable no-unused-vars */
 assert.equal(1, obj.foo);
 assert.equal(2, obj.bar);
 assert.equal(2, foo);
diff --git a/test/parallel/test-vm-run-in-new-context.js b/test/parallel/test-vm-run-in-new-context.js
index da14a041face31..2b32eccf408ff0 100644
--- a/test/parallel/test-vm-run-in-new-context.js
+++ b/test/parallel/test-vm-run-in-new-context.js
@@ -29,7 +29,9 @@ code = 'foo = 1;' +
        'if (baz !== 3) throw new Error(\'test fail\');';
 foo = 2;
 obj = { foo: 0, baz: 3 };
+/* eslint-disable no-unused-vars */
 var baz = vm.runInNewContext(code, obj);
+/* eslint-enable no-unused-vars */
 assert.equal(1, obj.foo);
 assert.equal(2, obj.bar);
 assert.equal(2, foo);
diff --git a/test/parallel/test-vm-static-this.js b/test/parallel/test-vm-static-this.js
index fb9cb764f8422c..a5f5ad9415a828 100644
--- a/test/parallel/test-vm-static-this.js
+++ b/test/parallel/test-vm-static-this.js
@@ -25,7 +25,9 @@ code = 'foo = 1;' +
        'if (typeof baz !== \'undefined\') throw new Error(\'test fail\');';
 foo = 2;
 obj = { foo: 0, baz: 3 };
+/* eslint-disable no-unused-vars */
 var baz = vm.runInThisContext(code);
+/* eslint-enable no-unused-vars */
 assert.equal(0, obj.foo);
 assert.equal(2, bar);
 assert.equal(1, foo);
diff --git a/test/pummel/test-dtrace-jsstack.js b/test/pummel/test-dtrace-jsstack.js
index b558dd28020c07..2e5c8670553138 100644
--- a/test/pummel/test-dtrace-jsstack.js
+++ b/test/pummel/test-dtrace-jsstack.js
@@ -32,7 +32,6 @@ var doogle = function() {
 };
 
 var spawn = require('child_process').spawn;
-var prefix = '/var/tmp/node';
 
 /*
  * We're going to use DTrace to stop us, gcore us, and set us running again
diff --git a/test/pummel/test-fs-watch-file.js b/test/pummel/test-fs-watch-file.js
index 7b57803dd4ec93..4e08e9e9d1cc9b 100644
--- a/test/pummel/test-fs-watch-file.js
+++ b/test/pummel/test-fs-watch-file.js
@@ -9,7 +9,6 @@ var watchSeenTwo = 0;
 var watchSeenThree = 0;
 var watchSeenFour = 0;
 
-var startDir = process.cwd();
 var testDir = common.tmpDir;
 
 var filenameOne = 'watch.txt';
diff --git a/test/pummel/test-https-no-reader.js b/test/pummel/test-https-no-reader.js
index 753687e67a5589..d9d2b64cc73d62 100644
--- a/test/pummel/test-https-no-reader.js
+++ b/test/pummel/test-https-no-reader.js
@@ -18,8 +18,6 @@ var options = {
 };
 
 var buf = new Buffer(1024 * 1024);
-var sent = 0;
-var received = 0;
 
 var server = https.createServer(options, function(req, res) {
   res.writeHead(200);
@@ -30,7 +28,6 @@ var server = https.createServer(options, function(req, res) {
 });
 
 server.listen(common.PORT, function() {
-  var resumed = false;
   var req = https.request({
     method: 'POST',
     port: common.PORT,
diff --git a/test/pummel/test-regress-GH-892.js b/test/pummel/test-regress-GH-892.js
index 67f9dd95aebe5f..11cab1b8b6230e 100644
--- a/test/pummel/test-regress-GH-892.js
+++ b/test/pummel/test-regress-GH-892.js
@@ -17,11 +17,7 @@ var https = require('https');
 
 var fs = require('fs');
 
-var PORT = 8000;
-
-
 var bytesExpected = 1024 * 1024 * 32;
-var gotResponse = false;
 
 var started = false;
 
diff --git a/test/pummel/test-stream2-basic.js b/test/pummel/test-stream2-basic.js
index 723e9a0308be00..564a3f7f42d5a0 100644
--- a/test/pummel/test-stream2-basic.js
+++ b/test/pummel/test-stream2-basic.js
@@ -157,7 +157,6 @@ test('pipe', function(t) {
                  'xxxxx' ];
 
   var w = new TestWriter();
-  var flush = true;
 
   w.on('end', function(received) {
     t.same(received, expect);
@@ -439,7 +438,6 @@ test('adding readable triggers data flow', function(t) {
       r.push(new Buffer('asdf'));
   };
 
-  var called = false;
   r.on('readable', function() {
     onReadable = true;
     r.read();
diff --git a/test/pummel/test-timers.js b/test/pummel/test-timers.js
index c9ac9b8bf6d905..d911beb6b09288 100644
--- a/test/pummel/test-timers.js
+++ b/test/pummel/test-timers.js
@@ -91,12 +91,12 @@ function t() {
   expectedTimeouts--;
 }
 
-var w = setTimeout(t, 200);
-var x = setTimeout(t, 200);
+setTimeout(t, 200);
+setTimeout(t, 200);
 var y = setTimeout(t, 200);
 
 clearTimeout(y);
-var z = setTimeout(t, 200);
+setTimeout(t, 200);
 clearTimeout(y);
 
 
diff --git a/test/pummel/test-watch-file.js b/test/pummel/test-watch-file.js
index 1d0ef77d543e43..b87711c7a17c45 100644
--- a/test/pummel/test-watch-file.js
+++ b/test/pummel/test-watch-file.js
@@ -6,7 +6,6 @@ var fs = require('fs');
 var path = require('path');
 
 var f = path.join(common.fixturesDir, 'x.txt');
-var f2 = path.join(common.fixturesDir, 'x2.txt');
 
 console.log('watching for changes of ' + f);
 
diff --git a/test/sequential/test-pump-file2tcp.js b/test/sequential/test-pump-file2tcp.js
index f5949085e0aec3..f99ae1c5d79ea6 100644
--- a/test/sequential/test-pump-file2tcp.js
+++ b/test/sequential/test-pump-file2tcp.js
@@ -28,7 +28,6 @@ server.listen(common.PORT, function() {
 });
 
 var buffer = '';
-var count = 0;
 
 server.on('listening', function() {
 });
diff --git a/test/sequential/test-stream2-fs.js b/test/sequential/test-stream2-fs.js
index 96ab97174b2478..e775dd7c0ab690 100644
--- a/test/sequential/test-stream2-fs.js
+++ b/test/sequential/test-stream2-fs.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var R = require('_stream_readable');
 var assert = require('assert');
 
 var fs = require('fs');
@@ -41,7 +40,6 @@ var w = new TestWriter();
 w.on('results', function(res) {
   console.error(res, w.length);
   assert.equal(w.length, size);
-  var l = 0;
   assert.deepEqual(res.map(function(c) {
     return c.length;
   }), expectLengths);
diff --git a/test/sequential/test-tcp-wrap-listen.js b/test/sequential/test-tcp-wrap-listen.js
index a2c07a7a9ce2a2..44254c3d3f39aa 100644
--- a/test/sequential/test-tcp-wrap-listen.js
+++ b/test/sequential/test-tcp-wrap-listen.js
@@ -12,7 +12,7 @@ assert.equal(0, r);
 
 server.listen(128);
 
-var slice, sliceCount = 0, eofCount = 0;
+var sliceCount = 0, eofCount = 0;
 
 var writeCount = 0;
 var recvCount = 0;
diff --git a/test/timers/test-timers-reliability.js b/test/timers/test-timers-reliability.js
index 966b82fd6217c9..76aa6ea31afe4d 100644
--- a/test/timers/test-timers-reliability.js
+++ b/test/timers/test-timers-reliability.js
@@ -44,7 +44,7 @@ monoTimer.ontimeout = function() {
 
 monoTimer.start(300, 0);
 
-var timer = setTimeout(function() {
+setTimeout(function() {
   timerFired = true;
 }, 200);
 

From e36811b06f1bdd8bfa4b778e1520191d84ba6a13 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 25 Dec 2015 21:52:52 -0800
Subject: [PATCH 04/11] test: remove unused vars in ChildProcess tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In addition to removing unused vars, this also fixes an instance where
booleans were set presumably to check something but then never used.
This now confirms that the events that were setting the booleans are
fired.

PR-URL: https://github.com/nodejs/node/pull/4425
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 test/parallel/test-child-process-buffering.js      |  2 --
 test/parallel/test-child-process-cwd.js            |  2 --
 test/parallel/test-child-process-exec-buffer.js    |  2 +-
 test/parallel/test-child-process-exec-cwd.js       |  2 +-
 test/parallel/test-child-process-fork-dgram.js     |  1 -
 test/parallel/test-child-process-fork-exec-path.js |  1 -
 test/parallel/test-child-process-fork-ref2.js      |  1 -
 test/parallel/test-child-process-spawn-error.js    |  1 -
 test/parallel/test-child-process-stdin.js          | 14 ++------------
 test/parallel/test-child-process-stdio-inherit.js  |  2 +-
 test/parallel/test-child-process-stdio.js          |  1 -
 .../test-child-process-stdout-flush-exit.js        |  1 -
 12 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/test/parallel/test-child-process-buffering.js b/test/parallel/test-child-process-buffering.js
index a37e1dbbbd7574..1efa5a65f9cea8 100644
--- a/test/parallel/test-child-process-buffering.js
+++ b/test/parallel/test-child-process-buffering.js
@@ -2,8 +2,6 @@
 var common = require('../common');
 var assert = require('assert');
 
-var spawn = require('child_process').spawn;
-
 var pwd_called = false;
 var childClosed = false;
 var childExited = false;
diff --git a/test/parallel/test-child-process-cwd.js b/test/parallel/test-child-process-cwd.js
index e0e83b6007a815..f13da684fbdfe4 100644
--- a/test/parallel/test-child-process-cwd.js
+++ b/test/parallel/test-child-process-cwd.js
@@ -1,8 +1,6 @@
 'use strict';
 var common = require('../common');
 var assert = require('assert');
-var spawn = require('child_process').spawn;
-var path = require('path');
 
 var returns = 0;
 
diff --git a/test/parallel/test-child-process-exec-buffer.js b/test/parallel/test-child-process-exec-buffer.js
index 0ab05080a2cb87..b9727f0c63add5 100644
--- a/test/parallel/test-child-process-exec-buffer.js
+++ b/test/parallel/test-child-process-exec-buffer.js
@@ -9,7 +9,7 @@ var success_count = 0;
 var str = 'hello';
 
 // default encoding
-var child = exec('echo ' + str, function(err, stdout, stderr) {
+exec('echo ' + str, function(err, stdout, stderr) {
   assert.ok('string', typeof(stdout), 'Expected stdout to be a string');
   assert.ok('string', typeof(stderr), 'Expected stderr to be a string');
   assert.equal(str + os.EOL, stdout);
diff --git a/test/parallel/test-child-process-exec-cwd.js b/test/parallel/test-child-process-exec-cwd.js
index e253399b96ac30..c259ffffda3dee 100644
--- a/test/parallel/test-child-process-exec-cwd.js
+++ b/test/parallel/test-child-process-exec-cwd.js
@@ -16,7 +16,7 @@ if (common.isWindows) {
   dir = '/dev';
 }
 
-var child = exec(pwdcommand, {cwd: dir}, function(err, stdout, stderr) {
+exec(pwdcommand, {cwd: dir}, function(err, stdout, stderr) {
   if (err) {
     error_count++;
     console.log('error!: ' + err.code);
diff --git a/test/parallel/test-child-process-fork-dgram.js b/test/parallel/test-child-process-fork-dgram.js
index f700960490cbaa..86cd6576c73b98 100644
--- a/test/parallel/test-child-process-fork-dgram.js
+++ b/test/parallel/test-child-process-fork-dgram.js
@@ -25,7 +25,6 @@ if (common.isWindows) {
 }
 
 if (process.argv[2] === 'child') {
-  var childCollected = 0;
   var server;
 
   process.on('message', function removeMe(msg, clusterServer) {
diff --git a/test/parallel/test-child-process-fork-exec-path.js b/test/parallel/test-child-process-fork-exec-path.js
index 6a61bddd8a19a4..35a730b0da6c42 100644
--- a/test/parallel/test-child-process-fork-exec-path.js
+++ b/test/parallel/test-child-process-fork-exec-path.js
@@ -1,6 +1,5 @@
 'use strict';
 var assert = require('assert');
-var cp = require('child_process');
 var fs = require('fs');
 var path = require('path');
 var common = require('../common');
diff --git a/test/parallel/test-child-process-fork-ref2.js b/test/parallel/test-child-process-fork-ref2.js
index b7addea8f9c77d..42c43ed8882b78 100644
--- a/test/parallel/test-child-process-fork-ref2.js
+++ b/test/parallel/test-child-process-fork-ref2.js
@@ -1,6 +1,5 @@
 'use strict';
 require('../common');
-var assert = require('assert');
 var fork = require('child_process').fork;
 
 if (process.argv[2] === 'child') {
diff --git a/test/parallel/test-child-process-spawn-error.js b/test/parallel/test-child-process-spawn-error.js
index 1398dac165319c..4eaa45ee7aefb0 100644
--- a/test/parallel/test-child-process-spawn-error.js
+++ b/test/parallel/test-child-process-spawn-error.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var fs = require('fs');
 var spawn = require('child_process').spawn;
 var assert = require('assert');
 
diff --git a/test/parallel/test-child-process-stdin.js b/test/parallel/test-child-process-stdin.js
index c12b24579375dc..4a371b83fb045b 100644
--- a/test/parallel/test-child-process-stdin.js
+++ b/test/parallel/test-child-process-stdin.js
@@ -18,30 +18,20 @@ var response = '';
 var exitStatus = -1;
 var closed = false;
 
-var gotStdoutEOF = false;
-
 cat.stdout.setEncoding('utf8');
 cat.stdout.on('data', function(chunk) {
   console.log('stdout: ' + chunk);
   response += chunk;
 });
 
-cat.stdout.on('end', function() {
-  gotStdoutEOF = true;
-});
-
-
-var gotStderrEOF = false;
+cat.stdout.on('end', common.mustCall(function() {}));
 
 cat.stderr.on('data', function(chunk) {
   // shouldn't get any stderr output
   assert.ok(false);
 });
 
-cat.stderr.on('end', function(chunk) {
-  gotStderrEOF = true;
-});
-
+cat.stderr.on('end', common.mustCall(function() {}));
 
 cat.on('exit', function(status) {
   console.log('exit event');
diff --git a/test/parallel/test-child-process-stdio-inherit.js b/test/parallel/test-child-process-stdio-inherit.js
index 8cf08a7bd5fa71..409c0af7ca0d31 100644
--- a/test/parallel/test-child-process-stdio-inherit.js
+++ b/test/parallel/test-child-process-stdio-inherit.js
@@ -31,5 +31,5 @@ function grandparent() {
 
 function parent() {
   // should not immediately exit.
-  var child = common.spawnCat({ stdio: 'inherit' });
+  common.spawnCat({ stdio: 'inherit' });
 }
diff --git a/test/parallel/test-child-process-stdio.js b/test/parallel/test-child-process-stdio.js
index 1ff6e4d914f7ec..d5fe6d43b64d5c 100644
--- a/test/parallel/test-child-process-stdio.js
+++ b/test/parallel/test-child-process-stdio.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common');
 var assert = require('assert');
-var spawn = require('child_process').spawn;
 
 var options = {stdio: ['pipe']};
 var child = common.spawnPwd(options);
diff --git a/test/parallel/test-child-process-stdout-flush-exit.js b/test/parallel/test-child-process-stdout-flush-exit.js
index 577a33a05082f2..b76a7cb5e5a8e2 100644
--- a/test/parallel/test-child-process-stdout-flush-exit.js
+++ b/test/parallel/test-child-process-stdout-flush-exit.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common');
 var assert = require('assert');
-var path = require('path');
 
 // if child process output to console and exit
 if (process.argv[2] === 'child') {

From 8c094be1570d67d02cfd6086f44d5ef62b174519 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 26 Dec 2015 13:48:54 -0800
Subject: [PATCH 05/11] test: remove unused variables from net tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove a handful of variables that are declared but never used in the
tests for the net module.

PR-URL: https://github.com/nodejs/node/pull/4430
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 test/parallel/test-net-create-connection.js   | 2 +-
 test/parallel/test-net-dns-custom-lookup.js   | 1 -
 test/parallel/test-net-dns-lookup-skip.js     | 1 -
 test/parallel/test-net-listen-close-server.js | 1 -
 test/parallel/test-net-local-address-port.js  | 2 +-
 test/parallel/test-net-localerror.js          | 2 +-
 test/parallel/test-net-reconnect.js           | 1 -
 7 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/test/parallel/test-net-create-connection.js b/test/parallel/test-net-create-connection.js
index c245ddc2ae7860..38452be6e6a954 100644
--- a/test/parallel/test-net-create-connection.js
+++ b/test/parallel/test-net-create-connection.js
@@ -22,7 +22,7 @@ server.listen(tcpPort, 'localhost', function() {
 
   function fail(opts, errtype, msg) {
     assert.throws(function() {
-      var client = net.createConnection(opts, cb);
+      net.createConnection(opts, cb);
     }, function(err) {
       return err instanceof errtype && msg === err.message;
     });
diff --git a/test/parallel/test-net-dns-custom-lookup.js b/test/parallel/test-net-dns-custom-lookup.js
index 008e831c61fc9c..a2ce3966ae1237 100644
--- a/test/parallel/test-net-dns-custom-lookup.js
+++ b/test/parallel/test-net-dns-custom-lookup.js
@@ -2,7 +2,6 @@
 var common = require('../common');
 var assert = require('assert');
 var net = require('net');
-var dns = require('dns');
 var ok = false;
 
 function check(addressType, cb) {
diff --git a/test/parallel/test-net-dns-lookup-skip.js b/test/parallel/test-net-dns-lookup-skip.js
index b293196ad45c7e..9b3ae15fc393ae 100644
--- a/test/parallel/test-net-dns-lookup-skip.js
+++ b/test/parallel/test-net-dns-lookup-skip.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 var net = require('net');
 
 function check(addressType) {
diff --git a/test/parallel/test-net-listen-close-server.js b/test/parallel/test-net-listen-close-server.js
index 144ca58bbbe2b9..9cde6df1645d01 100644
--- a/test/parallel/test-net-listen-close-server.js
+++ b/test/parallel/test-net-listen-close-server.js
@@ -2,7 +2,6 @@
 var common = require('../common');
 var assert = require('assert');
 var net = require('net');
-var gotError = false;
 
 var server = net.createServer(function(socket) {
 });
diff --git a/test/parallel/test-net-local-address-port.js b/test/parallel/test-net-local-address-port.js
index aa28d180dae6ff..728993ee1bb023 100644
--- a/test/parallel/test-net-local-address-port.js
+++ b/test/parallel/test-net-local-address-port.js
@@ -3,7 +3,7 @@ var common = require('../common');
 var assert = require('assert');
 var net = require('net');
 
-var conns = 0, conns_closed = 0;
+var conns = 0;
 
 var server = net.createServer(function(socket) {
   conns++;
diff --git a/test/parallel/test-net-localerror.js b/test/parallel/test-net-localerror.js
index 45ec1fc9099955..ed7c9471e0397f 100644
--- a/test/parallel/test-net-localerror.js
+++ b/test/parallel/test-net-localerror.js
@@ -17,6 +17,6 @@ connect({
 
 function connect(opts, msg) {
   assert.throws(function() {
-    var client = net.connect(opts);
+    net.connect(opts);
   }, msg);
 }
diff --git a/test/parallel/test-net-reconnect.js b/test/parallel/test-net-reconnect.js
index b2e8f6ea8b4e3f..f8cdcbdc4e76dd 100644
--- a/test/parallel/test-net-reconnect.js
+++ b/test/parallel/test-net-reconnect.js
@@ -5,7 +5,6 @@ var assert = require('assert');
 var net = require('net');
 
 var N = 50;
-var c = 0;
 var client_recv_count = 0;
 var client_end_count = 0;
 var disconnect_count = 0;

From ba1847d643bb1263ec1cff2e39264b7fa2c61ce3 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 25 Dec 2015 22:00:10 -0800
Subject: [PATCH 06/11] test: remove unused variables from HTTPS tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/4426
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-https-agent-servername.js        | 1 -
 test/parallel/test-https-byteswritten.js            | 1 -
 test/parallel/test-https-eof-for-eom.js             | 2 +-
 test/parallel/test-https-localaddress-bind-error.js | 2 +-
 test/parallel/test-https-socket-options.js          | 2 --
 test/parallel/test-https-strict.js                  | 2 +-
 test/parallel/test-https-timeout-server-2.js        | 1 -
 test/parallel/test-https-timeout-server.js          | 1 -
 test/parallel/test-https-timeout.js                 | 2 --
 test/parallel/test-https-truncate.js                | 1 -
 10 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/test/parallel/test-https-agent-servername.js b/test/parallel/test-https-agent-servername.js
index 2be40836a04ea2..f7d5e5a40d8679 100644
--- a/test/parallel/test-https-agent-servername.js
+++ b/test/parallel/test-https-agent-servername.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
diff --git a/test/parallel/test-https-byteswritten.js b/test/parallel/test-https-byteswritten.js
index 5163eccc262ffa..beef89b25ccb98 100644
--- a/test/parallel/test-https-byteswritten.js
+++ b/test/parallel/test-https-byteswritten.js
@@ -2,7 +2,6 @@
 var common = require('../common');
 var assert = require('assert');
 var fs = require('fs');
-var http = require('http');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
diff --git a/test/parallel/test-https-eof-for-eom.js b/test/parallel/test-https-eof-for-eom.js
index 0445625bace642..50d909373ff5b0 100644
--- a/test/parallel/test-https-eof-for-eom.js
+++ b/test/parallel/test-https-eof-for-eom.js
@@ -53,7 +53,7 @@ var bodyBuffer = '';
 
 server.listen(common.PORT, function() {
   console.log('1) Making Request');
-  var req = https.get({
+  https.get({
     port: common.PORT,
     rejectUnauthorized: false
   }, function(res) {
diff --git a/test/parallel/test-https-localaddress-bind-error.js b/test/parallel/test-https-localaddress-bind-error.js
index 66551a780aed9e..f5bb1f84c310b3 100644
--- a/test/parallel/test-https-localaddress-bind-error.js
+++ b/test/parallel/test-https-localaddress-bind-error.js
@@ -28,7 +28,7 @@ var server = https.createServer(options, function(req, res) {
 });
 
 server.listen(common.PORT, '127.0.0.1', function() {
-  var req = https.request({
+  https.request({
     host: 'localhost',
     port: common.PORT,
     path: '/',
diff --git a/test/parallel/test-https-socket-options.js b/test/parallel/test-https-socket-options.js
index 44e179f27a800c..2adf8c798dff65 100644
--- a/test/parallel/test-https-socket-options.js
+++ b/test/parallel/test-https-socket-options.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
@@ -9,7 +8,6 @@ if (!common.hasCrypto) {
 var https = require('https');
 
 var fs = require('fs');
-var exec = require('child_process').exec;
 
 var http = require('http');
 
diff --git a/test/parallel/test-https-strict.js b/test/parallel/test-https-strict.js
index 65ebfabde2bcdd..04561959de130f 100644
--- a/test/parallel/test-https-strict.js
+++ b/test/parallel/test-https-strict.js
@@ -110,7 +110,7 @@ function makeReq(path, port, error, host, ca) {
     path: path,
     ca: ca
   };
-  var whichCa = 0;
+
   if (!ca) {
     options.agent = agent0;
   } else {
diff --git a/test/parallel/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js
index df605958cf42df..a195ce1938b9cd 100644
--- a/test/parallel/test-https-timeout-server-2.js
+++ b/test/parallel/test-https-timeout-server-2.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 }
 var https = require('https');
 
-var net = require('net');
 var tls = require('tls');
 var fs = require('fs');
 
diff --git a/test/parallel/test-https-timeout-server.js b/test/parallel/test-https-timeout-server.js
index ba175ecf763ecf..f6d5d75a88abbe 100644
--- a/test/parallel/test-https-timeout-server.js
+++ b/test/parallel/test-https-timeout-server.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 var https = require('https');
 
 var net = require('net');
-var tls = require('tls');
 var fs = require('fs');
 
 var clientErrors = 0;
diff --git a/test/parallel/test-https-timeout.js b/test/parallel/test-https-timeout.js
index 7f34c18bec0897..2b41dadaec7857 100644
--- a/test/parallel/test-https-timeout.js
+++ b/test/parallel/test-https-timeout.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
@@ -9,7 +8,6 @@ if (!common.hasCrypto) {
 var https = require('https');
 
 var fs = require('fs');
-var exec = require('child_process').exec;
 
 var options = {
   key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
diff --git a/test/parallel/test-https-truncate.js b/test/parallel/test-https-truncate.js
index e77bf29ed25454..83506c65d6f3cc 100644
--- a/test/parallel/test-https-truncate.js
+++ b/test/parallel/test-https-truncate.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 var https = require('https');
 
 var fs = require('fs');
-var path = require('path');
 
 var key = fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem');
 var cert = fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem');

From 7c30944c8b4c09673fafb496e30a8ee15bbc50ff Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 25 Dec 2015 20:31:50 -0800
Subject: [PATCH 07/11] test: remove unused variables from TLS tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some of the TLS tests have variables that do not get used. This removes
those variables.

PR-URL: https://github.com/nodejs/node/pull/4424
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-tls-0-dns-altname.js               | 1 -
 test/parallel/test-tls-async-cb-after-socket-end.js   | 1 -
 test/parallel/test-tls-client-default-ciphers.js      | 2 +-
 test/parallel/test-tls-close-error.js                 | 1 -
 test/parallel/test-tls-close-notify.js                | 1 -
 test/parallel/test-tls-destroy-whilst-write.js        | 1 -
 test/parallel/test-tls-fast-writing.js                | 2 +-
 test/parallel/test-tls-handshake-error.js             | 1 -
 test/parallel/test-tls-handshake-nohang.js            | 1 -
 test/parallel/test-tls-invoke-queued.js               | 1 -
 test/parallel/test-tls-key-mismatch.js                | 2 --
 test/parallel/test-tls-max-send-fragment.js           | 1 -
 test/parallel/test-tls-ocsp-callback.js               | 1 -
 test/parallel/test-tls-peer-certificate-encoding.js   | 1 -
 test/parallel/test-tls-peer-certificate-multi-keys.js | 1 -
 test/parallel/test-tls-peer-certificate.js            | 1 -
 test/parallel/test-tls-request-timeout.js             | 2 +-
 test/parallel/test-tls-socket-default-options.js      | 1 -
 test/parallel/test-tls-ticket-cluster.js              | 1 -
 19 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/test/parallel/test-tls-0-dns-altname.js b/test/parallel/test-tls-0-dns-altname.js
index 61458142bc0115..95ceb1aa59aaea 100644
--- a/test/parallel/test-tls-0-dns-altname.js
+++ b/test/parallel/test-tls-0-dns-altname.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 
 var fs = require('fs');
-var net = require('net');
 
 var common = require('../common');
 
diff --git a/test/parallel/test-tls-async-cb-after-socket-end.js b/test/parallel/test-tls-async-cb-after-socket-end.js
index ea40205bfff06f..d89a4e9930ca6a 100644
--- a/test/parallel/test-tls-async-cb-after-socket-end.js
+++ b/test/parallel/test-tls-async-cb-after-socket-end.js
@@ -2,7 +2,6 @@
 
 var common = require('../common');
 
-var assert = require('assert');
 var path = require('path');
 var fs = require('fs');
 var constants = require('constants');
diff --git a/test/parallel/test-tls-client-default-ciphers.js b/test/parallel/test-tls-client-default-ciphers.js
index e38671fd6f9de1..9905fc45bdcd24 100644
--- a/test/parallel/test-tls-client-default-ciphers.js
+++ b/test/parallel/test-tls-client-default-ciphers.js
@@ -19,7 +19,7 @@ function test1() {
   };
 
   try {
-    var s = tls.connect(common.PORT);
+    tls.connect(common.PORT);
   } catch (e) {
     assert(e instanceof Done);
   }
diff --git a/test/parallel/test-tls-close-error.js b/test/parallel/test-tls-close-error.js
index 5c5a797c280a7d..bd38cb55f7a17b 100644
--- a/test/parallel/test-tls-close-error.js
+++ b/test/parallel/test-tls-close-error.js
@@ -10,7 +10,6 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 
 var fs = require('fs');
-var net = require('net');
 
 var errorCount = 0;
 var closeCount = 0;
diff --git a/test/parallel/test-tls-close-notify.js b/test/parallel/test-tls-close-notify.js
index 5cc3021ab8dd7e..5545f4512d5f39 100644
--- a/test/parallel/test-tls-close-notify.js
+++ b/test/parallel/test-tls-close-notify.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 
 var fs = require('fs');
-var net = require('net');
 
 var ended = 0;
 
diff --git a/test/parallel/test-tls-destroy-whilst-write.js b/test/parallel/test-tls-destroy-whilst-write.js
index f42ed1d4ea7702..26c20264735926 100644
--- a/test/parallel/test-tls-destroy-whilst-write.js
+++ b/test/parallel/test-tls-destroy-whilst-write.js
@@ -1,5 +1,4 @@
 'use strict';
-var assert = require('assert');
 var common = require('../common');
 
 if (!common.hasCrypto) {
diff --git a/test/parallel/test-tls-fast-writing.js b/test/parallel/test-tls-fast-writing.js
index 009fa40b631ee5..1f65391480d59d 100644
--- a/test/parallel/test-tls-fast-writing.js
+++ b/test/parallel/test-tls-fast-writing.js
@@ -20,7 +20,7 @@ var server = tls.createServer(options, onconnection);
 var gotChunk = false;
 var gotDrain = false;
 
-var timer = setTimeout(function() {
+setTimeout(function() {
   console.log('not ok - timed out');
   process.exit(1);
 }, common.platformTimeout(500));
diff --git a/test/parallel/test-tls-handshake-error.js b/test/parallel/test-tls-handshake-error.js
index f33177455f8943..f65440ed93b1a3 100644
--- a/test/parallel/test-tls-handshake-error.js
+++ b/test/parallel/test-tls-handshake-error.js
@@ -10,7 +10,6 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 
 var fs = require('fs');
-var net = require('net');
 
 var errorCount = 0;
 var closeCount = 0;
diff --git a/test/parallel/test-tls-handshake-nohang.js b/test/parallel/test-tls-handshake-nohang.js
index ae07551ef98088..374ac02a2f45b5 100644
--- a/test/parallel/test-tls-handshake-nohang.js
+++ b/test/parallel/test-tls-handshake-nohang.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
diff --git a/test/parallel/test-tls-invoke-queued.js b/test/parallel/test-tls-invoke-queued.js
index f833108ea3f9e0..efa5c0aa9aa31d 100644
--- a/test/parallel/test-tls-invoke-queued.js
+++ b/test/parallel/test-tls-invoke-queued.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 
 var fs = require('fs');
-var net = require('net');
 
 
 var received = '';
diff --git a/test/parallel/test-tls-key-mismatch.js b/test/parallel/test-tls-key-mismatch.js
index f7919c545aefb1..2e17a4931078c7 100644
--- a/test/parallel/test-tls-key-mismatch.js
+++ b/test/parallel/test-tls-key-mismatch.js
@@ -14,8 +14,6 @@ var options = {
   cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem')
 };
 
-var cert = null;
-
 assert.throws(function() {
   tls.createSecureContext(options);
 });
diff --git a/test/parallel/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js
index cc9413b81e78d6..8b1bf0998aad30 100644
--- a/test/parallel/test-tls-max-send-fragment.js
+++ b/test/parallel/test-tls-max-send-fragment.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 
 var fs = require('fs');
-var net = require('net');
 
 var common = require('../common');
 
diff --git a/test/parallel/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js
index a11be7ac22d1c5..e9443f45357995 100644
--- a/test/parallel/test-tls-ocsp-callback.js
+++ b/test/parallel/test-tls-ocsp-callback.js
@@ -41,7 +41,6 @@ function test(testOptions, cb) {
   var clientSecure = 0;
   var ocspCount = 0;
   var ocspResponse;
-  var session;
 
   if (testOptions.pfx) {
     delete options.key;
diff --git a/test/parallel/test-tls-peer-certificate-encoding.js b/test/parallel/test-tls-peer-certificate-encoding.js
index 96cb6944ef6a97..32b1583a0c4840 100644
--- a/test/parallel/test-tls-peer-certificate-encoding.js
+++ b/test/parallel/test-tls-peer-certificate-encoding.js
@@ -11,7 +11,6 @@ var tls = require('tls');
 var fs = require('fs');
 var util = require('util');
 var join = require('path').join;
-var spawn = require('child_process').spawn;
 
 var options = {
   key: fs.readFileSync(join(common.fixturesDir, 'keys', 'agent5-key.pem')),
diff --git a/test/parallel/test-tls-peer-certificate-multi-keys.js b/test/parallel/test-tls-peer-certificate-multi-keys.js
index fca7a1a77dda67..50ce9037f8d755 100644
--- a/test/parallel/test-tls-peer-certificate-multi-keys.js
+++ b/test/parallel/test-tls-peer-certificate-multi-keys.js
@@ -11,7 +11,6 @@ var tls = require('tls');
 var fs = require('fs');
 var util = require('util');
 var join = require('path').join;
-var spawn = require('child_process').spawn;
 
 var options = {
   key: fs.readFileSync(join(common.fixturesDir, 'agent.key')),
diff --git a/test/parallel/test-tls-peer-certificate.js b/test/parallel/test-tls-peer-certificate.js
index 3cb0eef2d56268..cdf8bf5644f675 100644
--- a/test/parallel/test-tls-peer-certificate.js
+++ b/test/parallel/test-tls-peer-certificate.js
@@ -11,7 +11,6 @@ var tls = require('tls');
 var fs = require('fs');
 var util = require('util');
 var join = require('path').join;
-var spawn = require('child_process').spawn;
 
 var options = {
   key: fs.readFileSync(join(common.fixturesDir, 'keys', 'agent1-key.pem')),
diff --git a/test/parallel/test-tls-request-timeout.js b/test/parallel/test-tls-request-timeout.js
index a9b1c78c91a0bf..0db2a613afc9e4 100644
--- a/test/parallel/test-tls-request-timeout.js
+++ b/test/parallel/test-tls-request-timeout.js
@@ -29,7 +29,7 @@ var server = tls.Server(options, function(socket) {
 });
 
 server.listen(common.PORT, function() {
-  var socket = tls.connect({
+  tls.connect({
     port: common.PORT,
     rejectUnauthorized: false
   });
diff --git a/test/parallel/test-tls-socket-default-options.js b/test/parallel/test-tls-socket-default-options.js
index 7b41d0f5a9ec23..c2c6e518bbc4d8 100644
--- a/test/parallel/test-tls-socket-default-options.js
+++ b/test/parallel/test-tls-socket-default-options.js
@@ -9,7 +9,6 @@ if (!common.hasCrypto) {
 const tls = require('tls');
 
 const fs = require('fs');
-const net = require('net');
 
 const sent = 'hello world';
 
diff --git a/test/parallel/test-tls-ticket-cluster.js b/test/parallel/test-tls-ticket-cluster.js
index fc0f1d5e858d00..1fd1776ca8199f 100644
--- a/test/parallel/test-tls-ticket-cluster.js
+++ b/test/parallel/test-tls-ticket-cluster.js
@@ -42,7 +42,6 @@ if (cluster.isMaster) {
 
   function fork() {
     var worker = cluster.fork();
-    var workerReqCount = 0;
     worker.on('message', function(msg) {
       console.error('[master] got %j', msg);
       if (msg === 'reused') {

From 36d28ce3b3deb89986e949f5e52245787e7c9230 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 26 Dec 2015 15:04:56 -0800
Subject: [PATCH 08/11] test: extend timeout in Debug mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Debug mode slows execution speed. There is work afoot to enable Debug
mode runs on the continuous integration infrastructure for the project.
Some tests are timing out, such as test-net-GH-5504.js.

This change doubles the timeout returned from `common.platformTimeout()`
when running in Debug mode. It also removes an unused variable from the
aforementioned test-net-GH-5504.js.

PR-URL: https://github.com/nodejs/node/pull/4431
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/common.js                      | 3 +++
 test/sequential/test-net-GH-5504.js | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/common.js b/test/common.js
index c1012e7a097688..5f18fec74a6945 100644
--- a/test/common.js
+++ b/test/common.js
@@ -255,6 +255,9 @@ exports.spawnPwd = function(options) {
 };
 
 exports.platformTimeout = function(ms) {
+  if (process.config.target_defaults.default_configuration === 'Debug')
+    ms = 2 * ms;
+
   if (process.arch !== 'arm')
     return ms;
 
diff --git a/test/sequential/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js
index 9526993dfd12c2..179b3ae3c2e241 100644
--- a/test/sequential/test-net-GH-5504.js
+++ b/test/sequential/test-net-GH-5504.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 // this test only fails with CentOS 6.3 using kernel version 2.6.32
 // On other linuxes and darwin, the `read` call gets an ECONNRESET in

From eb53af2797de3c9db14c29fd0bddd1587632bce8 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 25 Dec 2015 15:32:13 -0800
Subject: [PATCH 09/11] test: remove unused variables form http tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The http tests seem especially prone to including unused variables.
This change removes them.

PR-URL: https://github.com/nodejs/node/pull/4422
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-http-1.0-keep-alive.js                 | 1 -
 test/parallel/test-http-304.js                            | 1 -
 test/parallel/test-http-abort-client.js                   | 2 +-
 test/parallel/test-http-after-connect.js                  | 2 +-
 test/parallel/test-http-agent-keepalive.js                | 1 -
 test/parallel/test-http-agent-null.js                     | 1 -
 test/parallel/test-http-byteswritten.js                   | 1 -
 test/parallel/test-http-client-abort2.js                  | 1 -
 test/parallel/test-http-client-encoding.js                | 1 -
 test/parallel/test-http-client-pipe-end.js                | 1 -
 test/parallel/test-http-default-port.js                   | 2 +-
 test/parallel/test-http-destroyed-socket-write2.js        | 1 -
 test/parallel/test-http-eof-on-connect.js                 | 1 -
 test/parallel/test-http-exceptions.js                     | 4 +---
 test/parallel/test-http-flush.js                          | 1 -
 .../test-http-incoming-pipelined-socket-destroy.js        | 1 -
 test/parallel/test-http-keep-alive.js                     | 1 -
 test/parallel/test-http-localaddress-bind-error.js        | 2 +-
 test/parallel/test-http-many-ended-pipelines.js           | 1 -
 test/parallel/test-http-no-content-length.js              | 2 +-
 test/parallel/test-http-pipeline-regr-3508.js             | 1 -
 test/parallel/test-http-proxy.js                          | 4 ++--
 test/parallel/test-http-raw-headers.js                    | 8 --------
 test/parallel/test-http-regr-gh-2821.js                   | 1 -
 test/parallel/test-http-res-write-after-end.js            | 2 +-
 test/parallel/test-http-server-stale-close.js             | 1 -
 test/parallel/test-http-timeout.js                        | 1 -
 test/parallel/test-http-unix-socket.js                    | 1 -
 test/parallel/test-http-url.parse-https.request.js        | 1 -
 29 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/test/parallel/test-http-1.0-keep-alive.js b/test/parallel/test-http-1.0-keep-alive.js
index eac0fe51e2206a..516a02031ef247 100644
--- a/test/parallel/test-http-1.0-keep-alive.js
+++ b/test/parallel/test-http-1.0-keep-alive.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 var http = require('http');
 var net = require('net');
 
diff --git a/test/parallel/test-http-304.js b/test/parallel/test-http-304.js
index 06fd60f5572ba2..6ac1c68d0d3665 100644
--- a/test/parallel/test-http-304.js
+++ b/test/parallel/test-http-304.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 var http = require('http');
 var childProcess = require('child_process');
diff --git a/test/parallel/test-http-abort-client.js b/test/parallel/test-http-abort-client.js
index e24ded11d1a7ec..4d7a32c1dfb26b 100644
--- a/test/parallel/test-http-abort-client.js
+++ b/test/parallel/test-http-abort-client.js
@@ -14,7 +14,7 @@ var server = http.Server(function(req, res) {
 var responseClose = false;
 
 server.listen(common.PORT, function() {
-  var client = http.get({
+  http.get({
     port: common.PORT,
     headers: { connection: 'keep-alive' }
 
diff --git a/test/parallel/test-http-after-connect.js b/test/parallel/test-http-after-connect.js
index edd03b2178b2ba..ed18def8608820 100644
--- a/test/parallel/test-http-after-connect.js
+++ b/test/parallel/test-http-after-connect.js
@@ -45,7 +45,7 @@ server.listen(common.PORT, function() {
 });
 
 function doRequest(i) {
-  var req = http.get({
+  http.get({
     port: common.PORT,
     path: '/request' + i
   }, function(res) {
diff --git a/test/parallel/test-http-agent-keepalive.js b/test/parallel/test-http-agent-keepalive.js
index 8e80b00b2c1c49..6800e893e329da 100644
--- a/test/parallel/test-http-agent-keepalive.js
+++ b/test/parallel/test-http-agent-keepalive.js
@@ -3,7 +3,6 @@ const common = require('../common');
 const assert = require('assert');
 const http = require('http');
 const Agent = require('_http_agent').Agent;
-const EventEmitter = require('events').EventEmitter;
 
 const agent = new Agent({
   keepAlive: true,
diff --git a/test/parallel/test-http-agent-null.js b/test/parallel/test-http-agent-null.js
index e118738f664083..29961ff3a5e84b 100644
--- a/test/parallel/test-http-agent-null.js
+++ b/test/parallel/test-http-agent-null.js
@@ -2,7 +2,6 @@
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
-var net = require('net');
 
 var request = 0;
 var response = 0;
diff --git a/test/parallel/test-http-byteswritten.js b/test/parallel/test-http-byteswritten.js
index 974f446dd436b4..fdc407aec667ba 100644
--- a/test/parallel/test-http-byteswritten.js
+++ b/test/parallel/test-http-byteswritten.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common');
 var assert = require('assert');
-var fs = require('fs');
 var http = require('http');
 
 var body = 'hello world\n';
diff --git a/test/parallel/test-http-client-abort2.js b/test/parallel/test-http-client-abort2.js
index 3f7ae98fa25820..477d12b25827b2 100644
--- a/test/parallel/test-http-client-abort2.js
+++ b/test/parallel/test-http-client-abort2.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 var http = require('http');
 
 var server = http.createServer(function(req, res) {
diff --git a/test/parallel/test-http-client-encoding.js b/test/parallel/test-http-client-encoding.js
index dd696f4dff608a..baaef855b1e6e0 100644
--- a/test/parallel/test-http-client-encoding.js
+++ b/test/parallel/test-http-client-encoding.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 var http = require('http');
 
diff --git a/test/parallel/test-http-client-pipe-end.js b/test/parallel/test-http-client-pipe-end.js
index efe241419397e4..715f8ccf79df92 100644
--- a/test/parallel/test-http-client-pipe-end.js
+++ b/test/parallel/test-http-client-pipe-end.js
@@ -2,7 +2,6 @@
 // see https://github.com/joyent/node/issues/3257
 
 var common = require('../common');
-var assert = require('assert');
 var http = require('http');
 
 var server = http.createServer(function(req, res) {
diff --git a/test/parallel/test-http-default-port.js b/test/parallel/test-http-default-port.js
index 457424ecfa9397..e403b401fb603f 100644
--- a/test/parallel/test-http-default-port.js
+++ b/test/parallel/test-http-default-port.js
@@ -57,7 +57,7 @@ if (common.hasCrypto) {
     res.end('ok');
     this.close();
   }).listen(SSLPORT, function() {
-    var req = https.get({
+    https.get({
       host: 'localhost',
       rejectUnauthorized: false,
       headers: {
diff --git a/test/parallel/test-http-destroyed-socket-write2.js b/test/parallel/test-http-destroyed-socket-write2.js
index 5bbb3bbc946f7d..9065939ccbd798 100644
--- a/test/parallel/test-http-destroyed-socket-write2.js
+++ b/test/parallel/test-http-destroyed-socket-write2.js
@@ -6,7 +6,6 @@ var assert = require('assert');
 // where the server has ended the socket.
 
 var http = require('http');
-var net = require('net');
 var server = http.createServer(function(req, res) {
   setImmediate(function() {
     res.destroy();
diff --git a/test/parallel/test-http-eof-on-connect.js b/test/parallel/test-http-eof-on-connect.js
index e676643bab4911..fc7dd1d9fe88ce 100644
--- a/test/parallel/test-http-eof-on-connect.js
+++ b/test/parallel/test-http-eof-on-connect.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 var net = require('net');
 var http = require('http');
 
diff --git a/test/parallel/test-http-exceptions.js b/test/parallel/test-http-exceptions.js
index dc2d5583ddbaf9..922dc2095714be 100644
--- a/test/parallel/test-http-exceptions.js
+++ b/test/parallel/test-http-exceptions.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 var http = require('http');
 
 var server = http.createServer(function(req, res) {
@@ -11,9 +10,8 @@ var server = http.createServer(function(req, res) {
 });
 
 server.listen(common.PORT, function() {
-  var req;
   for (var i = 0; i < 4; i += 1) {
-    req = http.get({ port: common.PORT, path: '/busy/' + i });
+    http.get({ port: common.PORT, path: '/busy/' + i });
   }
 });
 
diff --git a/test/parallel/test-http-flush.js b/test/parallel/test-http-flush.js
index cac1caf752bee6..8dc7ba7418dc88 100644
--- a/test/parallel/test-http-flush.js
+++ b/test/parallel/test-http-flush.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 var http = require('http');
 
 http.createServer(function(req, res) {
diff --git a/test/parallel/test-http-incoming-pipelined-socket-destroy.js b/test/parallel/test-http-incoming-pipelined-socket-destroy.js
index 21cd3e69dfd746..1e5a910424d737 100644
--- a/test/parallel/test-http-incoming-pipelined-socket-destroy.js
+++ b/test/parallel/test-http-incoming-pipelined-socket-destroy.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 var http = require('http');
 var net = require('net');
diff --git a/test/parallel/test-http-keep-alive.js b/test/parallel/test-http-keep-alive.js
index f89f7698c46ebd..0d30bbe1da3069 100644
--- a/test/parallel/test-http-keep-alive.js
+++ b/test/parallel/test-http-keep-alive.js
@@ -11,7 +11,6 @@ var server = http.createServer(function(req, res) {
   res.end();
 });
 
-var connectCount = 0;
 var agent = new http.Agent({maxSockets: 1});
 var headers = {'connection': 'keep-alive'};
 var name = agent.getName({ port: common.PORT });
diff --git a/test/parallel/test-http-localaddress-bind-error.js b/test/parallel/test-http-localaddress-bind-error.js
index 9a4bde26cd22d6..adaeba2b9459ea 100644
--- a/test/parallel/test-http-localaddress-bind-error.js
+++ b/test/parallel/test-http-localaddress-bind-error.js
@@ -17,7 +17,7 @@ var server = http.createServer(function(req, res) {
 });
 
 server.listen(common.PORT, '127.0.0.1', function() {
-  var req = http.request({
+  http.request({
     host: 'localhost',
     port: common.PORT,
     path: '/',
diff --git a/test/parallel/test-http-many-ended-pipelines.js b/test/parallel/test-http-many-ended-pipelines.js
index 604dab7cc2c1d2..c415af64f9dcd6 100644
--- a/test/parallel/test-http-many-ended-pipelines.js
+++ b/test/parallel/test-http-many-ended-pipelines.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 // no warnings should happen!
 var trace = console.trace;
diff --git a/test/parallel/test-http-no-content-length.js b/test/parallel/test-http-no-content-length.js
index 5752e5e924cd1b..7a205dc07df3ca 100644
--- a/test/parallel/test-http-no-content-length.js
+++ b/test/parallel/test-http-no-content-length.js
@@ -10,7 +10,7 @@ var server = net.createServer(function(socket) {
   // Neither Content-Length nor Connection
   socket.end('HTTP/1.1 200 ok\r\n\r\nHello');
 }).listen(common.PORT, function() {
-  var req = http.get({port: common.PORT}, function(res) {
+  http.get({port: common.PORT}, function(res) {
     res.setEncoding('utf8');
     res.on('data', function(chunk) {
       body += chunk;
diff --git a/test/parallel/test-http-pipeline-regr-3508.js b/test/parallel/test-http-pipeline-regr-3508.js
index 05639a2a42c5a7..74fe7586726cbd 100644
--- a/test/parallel/test-http-pipeline-regr-3508.js
+++ b/test/parallel/test-http-pipeline-regr-3508.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common');
-const assert = require('assert');
 const http = require('http');
 const net = require('net');
 
diff --git a/test/parallel/test-http-proxy.js b/test/parallel/test-http-proxy.js
index fc8a753f2485ce..8a579cd69aa5b4 100644
--- a/test/parallel/test-http-proxy.js
+++ b/test/parallel/test-http-proxy.js
@@ -25,7 +25,7 @@ var backend = http.createServer(function(req, res) {
 
 var proxy = http.createServer(function(req, res) {
   console.error('proxy req headers: ' + JSON.stringify(req.headers));
-  var proxy_req = http.get({
+  http.get({
     port: BACKEND_PORT,
     path: url.parse(req.url).pathname
   }, function(proxy_res) {
@@ -56,7 +56,7 @@ function startReq() {
   nlistening++;
   if (nlistening < 2) return;
 
-  var client = http.get({
+  http.get({
     port: PROXY_PORT,
     path: '/test'
   }, function(res) {
diff --git a/test/parallel/test-http-raw-headers.js b/test/parallel/test-http-raw-headers.js
index 7ecaaa93cfb04e..2042c0262a95ed 100644
--- a/test/parallel/test-http-raw-headers.js
+++ b/test/parallel/test-http-raw-headers.js
@@ -54,14 +54,6 @@ http.createServer(function(req, res) {
   ]);
   res.end('x f o o');
 }).listen(common.PORT, function() {
-  var expectRawHeaders = [
-    'Date',
-    'Tue, 06 Aug 2013 01:31:54 GMT',
-    'Connection',
-    'close',
-    'Transfer-Encoding',
-    'chunked'
-  ];
   var req = http.request({ port: common.PORT, path: '/' });
   req.addTrailers([
     ['x-bAr', 'yOyOyOy'],
diff --git a/test/parallel/test-http-regr-gh-2821.js b/test/parallel/test-http-regr-gh-2821.js
index 4fdef2369bb168..8725111324a869 100644
--- a/test/parallel/test-http-regr-gh-2821.js
+++ b/test/parallel/test-http-regr-gh-2821.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common');
-const assert = require('assert');
 const http = require('http');
 
 const server = http.createServer(function(req, res) {
diff --git a/test/parallel/test-http-res-write-after-end.js b/test/parallel/test-http-res-write-after-end.js
index c8b3bf26e0804b..206f4273ec70c7 100644
--- a/test/parallel/test-http-res-write-after-end.js
+++ b/test/parallel/test-http-res-write-after-end.js
@@ -18,7 +18,7 @@ var server = http.Server(function(req, res) {
 });
 
 server.listen(common.PORT, function() {
-  var req = http.get({port: common.PORT}, function(res) {
+  http.get({port: common.PORT}, function(res) {
     server.close();
   });
 });
diff --git a/test/parallel/test-http-server-stale-close.js b/test/parallel/test-http-server-stale-close.js
index a866d39c2cc735..349e869c1a4fbc 100644
--- a/test/parallel/test-http-server-stale-close.js
+++ b/test/parallel/test-http-server-stale-close.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 var http = require('http');
 var util = require('util');
 var fork = require('child_process').fork;
diff --git a/test/parallel/test-http-timeout.js b/test/parallel/test-http-timeout.js
index aab903420f0acc..f459961517852b 100644
--- a/test/parallel/test-http-timeout.js
+++ b/test/parallel/test-http-timeout.js
@@ -1,6 +1,5 @@
 'use strict';
 var common = require('../common');
-var assert = require('assert');
 
 var http = require('http');
 
diff --git a/test/parallel/test-http-unix-socket.js b/test/parallel/test-http-unix-socket.js
index 98ed839241c2c6..bdac0566c33a42 100644
--- a/test/parallel/test-http-unix-socket.js
+++ b/test/parallel/test-http-unix-socket.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common');
 var assert = require('assert');
-var fs = require('fs');
 var http = require('http');
 
 var status_ok = false; // status code == 200?
diff --git a/test/parallel/test-http-url.parse-https.request.js b/test/parallel/test-http-url.parse-https.request.js
index 10c40ec0310708..df01ae64f81dba 100644
--- a/test/parallel/test-http-url.parse-https.request.js
+++ b/test/parallel/test-http-url.parse-https.request.js
@@ -10,7 +10,6 @@ var https = require('https');
 
 var url = require('url');
 var fs = require('fs');
-var clientRequest;
 
 // https options
 var httpsOptions = {

From b3b150c20b5470ed78ee74d5ae281507ac7519fd Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 1 Jan 2016 17:37:10 -0800
Subject: [PATCH 10/11] test: remove unused vars from parallel tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove all remaining unused variables from tests in test/parallel.

PR-URL: https://github.com/nodejs/node/pull/4511
Reviewed-By: James M Snell<jasnell@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-assert-typedarray-deepequal.js         | 2 +-
 test/parallel/test-buffer-fakes.js                        | 1 -
 test/parallel/test-child-process-exec-buffer.js           | 2 +-
 test/parallel/test-cluster-http-pipe.js                   | 1 -
 test/parallel/test-crypto-binary-default.js               | 1 -
 test/parallel/test-crypto-dh.js                           | 2 +-
 test/parallel/test-debug-signal-cluster.js                | 1 -
 test/parallel/test-dgram-error-message-address.js         | 1 -
 test/parallel/test-dgram-pingpong.js                      | 2 --
 test/parallel/test-domain-http-server.js                  | 1 -
 test/parallel/test-domain-implicit-fs.js                  | 1 -
 test/parallel/test-domain-uncaught-exception.js           | 2 --
 .../test-domain-with-abort-on-uncaught-exception.js       | 8 --------
 test/parallel/test-dsa-fips-invalid-key.js                | 2 --
 test/parallel/test-eval.js                                | 2 +-
 test/parallel/test-event-emitter-remove-listeners.js      | 5 -----
 test/parallel/test-file-write-stream3.js                  | 4 ++--
 test/parallel/test-fs-open-flags.js                       | 5 -----
 test/parallel/test-fs-open.js                             | 1 -
 test/parallel/test-fs-utimes.js                           | 2 +-
 test/parallel/test-fs-write-file-sync.js                  | 2 +-
 test/parallel/test-preload.js                             | 1 -
 test/parallel/test-process-release.js                     | 2 +-
 test/parallel/test-promises-unhandled-rejections.js       | 5 ++---
 test/parallel/test-readline-undefined-columns.js          | 2 +-
 test/parallel/test-regress-GH-4256.js                     | 2 +-
 test/parallel/test-repl-.save.load.js                     | 1 -
 test/parallel/test-repl-autolibs.js                       | 2 +-
 test/parallel/test-repl-domain.js                         | 1 -
 test/parallel/test-repl-syntax-error-stack.js             | 3 +--
 test/parallel/test-repl-tab-complete-crash.js             | 1 -
 test/parallel/test-repl-tab-complete.js                   | 1 -
 test/parallel/test-stream-pipe-error-handling.js          | 2 --
 test/parallel/test-stream-push-order.js                   | 2 +-
 test/parallel/test-stream-unshift-read-race.js            | 1 -
 test/parallel/test-stream-writev.js                       | 2 --
 test/parallel/test-stream2-compatibility.js               | 3 +--
 test/parallel/test-stream2-large-read-stall.js            | 3 ---
 test/parallel/test-stream2-objects.js                     | 2 --
 test/parallel/test-stream2-readable-from-list.js          | 4 ----
 test/parallel/test-stream2-transform.js                   | 3 ---
 test/parallel/test-timers-ordering.js                     | 3 ---
 test/parallel/test-timers-zero-timeout.js                 | 2 +-
 test/parallel/test-url.js                                 | 3 ---
 test/parallel/test-util-decorate-error-stack.js           | 2 +-
 test/parallel/test-util-internal.js                       | 2 +-
 46 files changed, 20 insertions(+), 83 deletions(-)

diff --git a/test/parallel/test-assert-typedarray-deepequal.js b/test/parallel/test-assert-typedarray-deepequal.js
index 32748784dfe9a8..68edefdc175317 100644
--- a/test/parallel/test-assert-typedarray-deepequal.js
+++ b/test/parallel/test-assert-typedarray-deepequal.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const a = require('assert');
 
diff --git a/test/parallel/test-buffer-fakes.js b/test/parallel/test-buffer-fakes.js
index 5804cbba303408..1a1d9c0c494b84 100644
--- a/test/parallel/test-buffer-fakes.js
+++ b/test/parallel/test-buffer-fakes.js
@@ -3,7 +3,6 @@
 require('../common');
 const assert = require('assert');
 const Buffer = require('buffer').Buffer;
-const Bp = Buffer.prototype;
 
 function FakeBuffer() { }
 FakeBuffer.__proto__ = Buffer;
diff --git a/test/parallel/test-child-process-exec-buffer.js b/test/parallel/test-child-process-exec-buffer.js
index b9727f0c63add5..a381af9631e0d8 100644
--- a/test/parallel/test-child-process-exec-buffer.js
+++ b/test/parallel/test-child-process-exec-buffer.js
@@ -18,7 +18,7 @@ exec('echo ' + str, function(err, stdout, stderr) {
 });
 
 // no encoding (Buffers expected)
-var child = exec('echo ' + str, {
+exec('echo ' + str, {
   encoding: null
 }, function(err, stdout, stderr) {
   assert.ok(stdout instanceof Buffer, 'Expected stdout to be a Buffer');
diff --git a/test/parallel/test-cluster-http-pipe.js b/test/parallel/test-cluster-http-pipe.js
index 4c6dee347bb8e9..cb9b090f08e801 100644
--- a/test/parallel/test-cluster-http-pipe.js
+++ b/test/parallel/test-cluster-http-pipe.js
@@ -34,7 +34,6 @@ http.createServer(function(req, res) {
   res.writeHead(200);
   res.end('OK');
 }).listen(common.PIPE, function() {
-  var self = this;
   http.get({ socketPath: common.PIPE, path: '/' }, function(res) {
     res.resume();
     res.on('end', function(err) {
diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index 806f5de18bbb1f..c4b8990beb2ec2 100644
--- a/test/parallel/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
@@ -20,7 +20,6 @@ var fs = require('fs');
 var path = require('path');
 
 // Test Certificates
-var caPem = fs.readFileSync(common.fixturesDir + '/test_ca.pem', 'ascii');
 var certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');
 var certPfx = fs.readFileSync(common.fixturesDir + '/test_cert.pfx');
 var keyPem = fs.readFileSync(common.fixturesDir + '/test_key.pem', 'ascii');
diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
index f3e54c46a8e16b..93224416ed9754 100644
--- a/test/parallel/test-crypto-dh.js
+++ b/test/parallel/test-crypto-dh.js
@@ -171,7 +171,7 @@ var ecdh3 = crypto.createECDH('secp256k1');
 var key3 = ecdh3.generateKeys();
 
 assert.throws(function() {
-  var secret3 = ecdh2.computeSecret(key3, 'binary', 'buffer');
+  ecdh2.computeSecret(key3, 'binary', 'buffer');
 });
 
 // ECDH should allow .setPrivateKey()/.setPublicKey()
diff --git a/test/parallel/test-debug-signal-cluster.js b/test/parallel/test-debug-signal-cluster.js
index 6572ef50afe845..7a950458b87271 100644
--- a/test/parallel/test-debug-signal-cluster.js
+++ b/test/parallel/test-debug-signal-cluster.js
@@ -10,7 +10,6 @@ var options = { stdio: ['inherit', 'inherit', 'pipe', 'ipc'] };
 var child = spawn(process.execPath, args, options);
 
 var outputLines = [];
-var outputTimerId;
 var waitingForDebuggers = false;
 
 var pids = null;
diff --git a/test/parallel/test-dgram-error-message-address.js b/test/parallel/test-dgram-error-message-address.js
index e307a23e2451db..005695654f9542 100644
--- a/test/parallel/test-dgram-error-message-address.js
+++ b/test/parallel/test-dgram-error-message-address.js
@@ -20,7 +20,6 @@ socket_ipv4.bind(common.PORT, '1.1.1.1');
 
 // IPv6 Test
 var socket_ipv6 = dgram.createSocket('udp6');
-var family_ipv6 = 'IPv6';
 
 socket_ipv6.on('listening', common.fail);
 
diff --git a/test/parallel/test-dgram-pingpong.js b/test/parallel/test-dgram-pingpong.js
index 29ab92757bd817..883085a9cdaab2 100644
--- a/test/parallel/test-dgram-pingpong.js
+++ b/test/parallel/test-dgram-pingpong.js
@@ -11,7 +11,6 @@ function pingPongTest(port, host) {
   var callbacks = 0;
   var N = 500;
   var count = 0;
-  var sent_final_ping = false;
 
   var server = dgram.createSocket('udp4', function(msg, rinfo) {
     if (debug) console.log('server got: ' + msg +
@@ -48,7 +47,6 @@ function pingPongTest(port, host) {
       if (count < N) {
         client.send(buf, 0, buf.length, port, 'localhost');
       } else {
-        sent_final_ping = true;
         client.send(buf, 0, buf.length, port, 'localhost', function() {
           client.close();
         });
diff --git a/test/parallel/test-domain-http-server.js b/test/parallel/test-domain-http-server.js
index 99dbf413e3a4f8..37dbc30f4234d7 100644
--- a/test/parallel/test-domain-http-server.js
+++ b/test/parallel/test-domain-http-server.js
@@ -9,7 +9,6 @@ objects.baz.asdf = objects;
 
 var serverCaught = 0;
 var clientCaught = 0;
-var disposeEmit = 0;
 
 var server = http.createServer(function(req, res) {
   var dom = domain.create();
diff --git a/test/parallel/test-domain-implicit-fs.js b/test/parallel/test-domain-implicit-fs.js
index a5bbb83bd62d53..d0a468419b923e 100644
--- a/test/parallel/test-domain-implicit-fs.js
+++ b/test/parallel/test-domain-implicit-fs.js
@@ -8,7 +8,6 @@ var caught = 0;
 var expectCaught = 1;
 
 var d = new domain.Domain();
-var e = new events.EventEmitter();
 
 d.on('error', function(er) {
   console.error('caught', er);
diff --git a/test/parallel/test-domain-uncaught-exception.js b/test/parallel/test-domain-uncaught-exception.js
index 8792eb1ce5459f..35632dbf537202 100644
--- a/test/parallel/test-domain-uncaught-exception.js
+++ b/test/parallel/test-domain-uncaught-exception.js
@@ -13,8 +13,6 @@ const assert = require('assert');
 const domain = require('domain');
 const child_process = require('child_process');
 
-const uncaughtExceptions = {};
-
 const tests = [];
 
 function test1() {
diff --git a/test/parallel/test-domain-with-abort-on-uncaught-exception.js b/test/parallel/test-domain-with-abort-on-uncaught-exception.js
index 130778038bf072..3158274ea181a9 100644
--- a/test/parallel/test-domain-with-abort-on-uncaught-exception.js
+++ b/test/parallel/test-domain-with-abort-on-uncaught-exception.js
@@ -31,7 +31,6 @@ const domainErrHandlerExMessage = 'exception from domain error handler';
 if (process.argv[2] === 'child') {
   var domain = require('domain');
   var d = domain.create();
-  var triggeredProcessUncaughtException = false;
 
   process.on('uncaughtException', function onUncaughtException() {
     // The process' uncaughtException event must not be emitted when
@@ -116,13 +115,6 @@ if (process.argv[2] === 'child') {
     var child = exec(cmdToExec);
 
     if (child) {
-      var childTriggeredOnUncaughtExceptionHandler = false;
-      child.on('message', function onChildMsg(msg) {
-        if (msg === 'triggeredProcessUncaughtEx') {
-          childTriggeredOnUncaughtExceptionHandler = true;
-        }
-      });
-
       child.on('exit', function onChildExited(exitCode, signal) {
         // When throwing errors from the top-level domain error handler
         // outside of a try/catch block, the process should not exit gracefully
diff --git a/test/parallel/test-dsa-fips-invalid-key.js b/test/parallel/test-dsa-fips-invalid-key.js
index 0b5773411ee592..2d30ef6891008a 100644
--- a/test/parallel/test-dsa-fips-invalid-key.js
+++ b/test/parallel/test-dsa-fips-invalid-key.js
@@ -12,8 +12,6 @@ var fs = require('fs');
 
 var input = 'hello';
 
-var dsapub = fs.readFileSync(common.fixturesDir +
-                             '/keys/dsa_public_1025.pem');
 var dsapri = fs.readFileSync(common.fixturesDir +
                              '/keys/dsa_private_1025.pem');
 var sign = crypto.createSign('DSS1');
diff --git a/test/parallel/test-eval.js b/test/parallel/test-eval.js
index d3a83fbd5a7060..59b5d1a240861a 100644
--- a/test/parallel/test-eval.js
+++ b/test/parallel/test-eval.js
@@ -10,7 +10,7 @@ var error_count = 0;
 var cmd = ['"' + process.execPath + '"', '-e', '"console.error(process.argv)"',
            'foo', 'bar'].join(' ');
 var expected = util.format([process.execPath, 'foo', 'bar']) + '\n';
-var child = exec(cmd, function(err, stdout, stderr) {
+exec(cmd, function(err, stdout, stderr) {
   if (err) {
     console.log(err.toString());
     ++error_count;
diff --git a/test/parallel/test-event-emitter-remove-listeners.js b/test/parallel/test-event-emitter-remove-listeners.js
index 8993aadf51a46e..396979a923d1ac 100644
--- a/test/parallel/test-event-emitter-remove-listeners.js
+++ b/test/parallel/test-event-emitter-remove-listeners.js
@@ -15,11 +15,6 @@ function listener2() {
   count++;
 }
 
-function listener3() {
-  console.log('listener3');
-  count++;
-}
-
 function remove1() {
   assert(0);
 }
diff --git a/test/parallel/test-file-write-stream3.js b/test/parallel/test-file-write-stream3.js
index 6ed852eb00995b..a2552d95b215d4 100644
--- a/test/parallel/test-file-write-stream3.js
+++ b/test/parallel/test-file-write-stream3.js
@@ -124,7 +124,7 @@ function run_test_2() {
 
 
 function run_test_3() {
-  var file, buffer, options;
+  var file, options;
 
   var data = '\u2026\u2026',    // 3 bytes * 2 = 6 bytes in UTF-8
       fileData;
@@ -167,7 +167,7 @@ function run_test_3() {
 
 
 function run_test_4() {
-  var file, options;
+  var options;
 
   options = { start: -5,
               flags: 'r+' };
diff --git a/test/parallel/test-fs-open-flags.js b/test/parallel/test-fs-open-flags.js
index b53a823603d0fc..667abb81765f91 100644
--- a/test/parallel/test-fs-open-flags.js
+++ b/test/parallel/test-fs-open-flags.js
@@ -7,14 +7,9 @@ var fs = require('fs');
 
 var O_APPEND = constants.O_APPEND || 0;
 var O_CREAT = constants.O_CREAT || 0;
-var O_DIRECTORY = constants.O_DIRECTORY || 0;
 var O_EXCL = constants.O_EXCL || 0;
-var O_NOCTTY = constants.O_NOCTTY || 0;
-var O_NOFOLLOW = constants.O_NOFOLLOW || 0;
 var O_RDONLY = constants.O_RDONLY || 0;
 var O_RDWR = constants.O_RDWR || 0;
-var O_SYMLINK = constants.O_SYMLINK || 0;
-var O_SYNC = constants.O_SYNC || 0;
 var O_TRUNC = constants.O_TRUNC || 0;
 var O_WRONLY = constants.O_WRONLY || 0;
 
diff --git a/test/parallel/test-fs-open.js b/test/parallel/test-fs-open.js
index 0a069b9a0bafda..0818f2b7f63d8f 100644
--- a/test/parallel/test-fs-open.js
+++ b/test/parallel/test-fs-open.js
@@ -1,6 +1,5 @@
 'use strict';
 require('../common');
-var constants = require('constants');
 var assert = require('assert');
 var fs = require('fs');
 
diff --git a/test/parallel/test-fs-utimes.js b/test/parallel/test-fs-utimes.js
index 2ad6cea4379b2e..5d5cb40ec1eede 100644
--- a/test/parallel/test-fs-utimes.js
+++ b/test/parallel/test-fs-utimes.js
@@ -48,7 +48,7 @@ function expect_ok(syscall, resource, err, atime, mtime) {
 // would be even better though (node doesn't have such functionality yet)
 function runTest(atime, mtime, callback) {
 
-  var fd, err;
+  var fd;
   //
   // test synchronized code paths, these functions throw on failure
   //
diff --git a/test/parallel/test-fs-write-file-sync.js b/test/parallel/test-fs-write-file-sync.js
index 37373404daf20e..5f51878cbd8340 100644
--- a/test/parallel/test-fs-write-file-sync.js
+++ b/test/parallel/test-fs-write-file-sync.js
@@ -15,7 +15,7 @@ fs._closeSync = fs.closeSync;
 fs.closeSync = closeSync;
 
 // Reset the umask for testing
-var mask = process.umask(0o000);
+process.umask(0o000);
 
 // On Windows chmod is only able to manipulate read-only bit. Test if creating
 // the file in read-only mode works.
diff --git a/test/parallel/test-preload.js b/test/parallel/test-preload.js
index c1d92c7818abb3..f30ad1d218e645 100644
--- a/test/parallel/test-preload.js
+++ b/test/parallel/test-preload.js
@@ -82,7 +82,6 @@ child_process.exec(nodeBinary + ' '
   });
 
 // https://github.com/nodejs/node/issues/1691
-var originalCwd = process.cwd();
 process.chdir(path.join(__dirname, '../fixtures/'));
 child_process.exec(nodeBinary + ' '
   + '--expose_debug_as=v8debug '
diff --git a/test/parallel/test-process-release.js b/test/parallel/test-process-release.js
index af21daf78b61b2..aac7009f2e90b8 100644
--- a/test/parallel/test-process-release.js
+++ b/test/parallel/test-process-release.js
@@ -1,5 +1,5 @@
 'use strict';
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const versionParts = process.versions.node.split('.');
 
diff --git a/test/parallel/test-promises-unhandled-rejections.js b/test/parallel/test-promises-unhandled-rejections.js
index e229bada3a10e2..5e7739daa5b406 100644
--- a/test/parallel/test-promises-unhandled-rejections.js
+++ b/test/parallel/test-promises-unhandled-rejections.js
@@ -185,12 +185,11 @@ asyncTest('When re-throwing new errors in a promise catch, only the' +
 asyncTest('Test params of unhandledRejection for a synchronously-rejected' +
           'promise', function(done) {
   var e = new Error();
-  var e2 = new Error();
   onUnhandledSucceed(done, function(reason, promise) {
     assert.strictEqual(e, reason);
     assert.strictEqual(promise, promise);
   });
-  var promise = Promise.reject(e);
+  Promise.reject(e);
 });
 
 asyncTest('When re-throwing new errors in a promise catch, only the ' +
@@ -629,7 +628,7 @@ asyncTest('Promise unhandledRejection handler does not interfere with domain' +
       assert.strictEqual(domainReceivedError, domainError);
       d.dispose();
     });
-    var a = Promise.reject(e);
+    Promise.reject(e);
     process.nextTick(function() {
       throw domainError;
     });
diff --git a/test/parallel/test-readline-undefined-columns.js b/test/parallel/test-readline-undefined-columns.js
index 73945af8bc52b9..24f138f46bce11 100644
--- a/test/parallel/test-readline-undefined-columns.js
+++ b/test/parallel/test-readline-undefined-columns.js
@@ -11,7 +11,7 @@ const readline = require('readline');
 const iStream = new PassThrough();
 const oStream = new PassThrough();
 
-const rli = readline.createInterface({
+readline.createInterface({
   terminal: true,
   input: iStream,
   output: oStream,
diff --git a/test/parallel/test-regress-GH-4256.js b/test/parallel/test-regress-GH-4256.js
index 1a4a78b3c0781d..a312fb277fdad5 100644
--- a/test/parallel/test-regress-GH-4256.js
+++ b/test/parallel/test-regress-GH-4256.js
@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
 process.domain = null;
-var timer = setTimeout(function() {
+setTimeout(function() {
   console.log('this console.log statement should not make node crash');
 }, 1);
diff --git a/test/parallel/test-repl-.save.load.js b/test/parallel/test-repl-.save.load.js
index c71b383bcd7409..6d28015b385e15 100644
--- a/test/parallel/test-repl-.save.load.js
+++ b/test/parallel/test-repl-.save.load.js
@@ -1,6 +1,5 @@
 'use strict';
 var assert = require('assert');
-var util = require('util');
 var join = require('path').join;
 var fs = require('fs');
 var common = require('../common');
diff --git a/test/parallel/test-repl-autolibs.js b/test/parallel/test-repl-autolibs.js
index 05cc299f56888f..15f779d3b12269 100644
--- a/test/parallel/test-repl-autolibs.js
+++ b/test/parallel/test-repl-autolibs.js
@@ -8,7 +8,7 @@ var repl = require('repl');
 common.globalCheck = false;
 
 const putIn = new common.ArrayStream();
-var testMe = repl.start('', putIn, null, true);
+repl.start('', putIn, null, true);
 
 test1();
 
diff --git a/test/parallel/test-repl-domain.js b/test/parallel/test-repl-domain.js
index 1de2405b3ca9a3..adc8478beef4af 100644
--- a/test/parallel/test-repl-domain.js
+++ b/test/parallel/test-repl-domain.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common');
 
-var util   = require('util');
 var repl   = require('repl');
 
 const putIn = new common.ArrayStream();
diff --git a/test/parallel/test-repl-syntax-error-stack.js b/test/parallel/test-repl-syntax-error-stack.js
index 647d3e3569ce00..ebf0b2e4d8aed1 100644
--- a/test/parallel/test-repl-syntax-error-stack.js
+++ b/test/parallel/test-repl-syntax-error-stack.js
@@ -4,7 +4,6 @@ const common = require('../common');
 const assert = require('assert');
 const path = require('path');
 const repl = require('repl');
-const util = require('util');
 let found = false;
 
 process.on('exit', () => {
@@ -17,7 +16,7 @@ common.ArrayStream.prototype.write = function(output) {
 };
 
 const putIn = new common.ArrayStream();
-const testMe = repl.start('', putIn);
+repl.start('', putIn);
 let file = path.resolve(__dirname, '../fixtures/syntax/bad_syntax');
 
 if (common.isWindows)
diff --git a/test/parallel/test-repl-tab-complete-crash.js b/test/parallel/test-repl-tab-complete-crash.js
index 484580f1e72fe5..ce283757438192 100644
--- a/test/parallel/test-repl-tab-complete-crash.js
+++ b/test/parallel/test-repl-tab-complete-crash.js
@@ -2,7 +2,6 @@
 
 const common = require('../common');
 const assert = require('assert');
-const util = require('util');
 const repl = require('repl');
 
 var referenceErrorCount = 0;
diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
index 6bf7d5059d0116..86a0444c953d27 100644
--- a/test/parallel/test-repl-tab-complete.js
+++ b/test/parallel/test-repl-tab-complete.js
@@ -4,7 +4,6 @@
 
 var common = require('../common');
 var assert = require('assert');
-var util = require('util');
 var repl = require('repl');
 var referenceErrors = 0;
 var expectedReferenceErrors = 0;
diff --git a/test/parallel/test-stream-pipe-error-handling.js b/test/parallel/test-stream-pipe-error-handling.js
index 8b674bffbd087b..88a70fb58e2cf1 100644
--- a/test/parallel/test-stream-pipe-error-handling.js
+++ b/test/parallel/test-stream-pipe-error-handling.js
@@ -38,7 +38,6 @@ var Stream = require('stream').Stream;
 })();
 
 (function testErrorWithRemovedListenerThrows() {
-  var EE = require('events').EventEmitter;
   var R = Stream.Readable;
   var W = Stream.Writable;
 
@@ -73,7 +72,6 @@ var Stream = require('stream').Stream;
 })();
 
 (function testErrorWithRemovedListenerThrows() {
-  var EE = require('events').EventEmitter;
   var R = Stream.Readable;
   var W = Stream.Writable;
 
diff --git a/test/parallel/test-stream-push-order.js b/test/parallel/test-stream-push-order.js
index 0bbcdf522b28fa..f09cf95f370bce 100644
--- a/test/parallel/test-stream-push-order.js
+++ b/test/parallel/test-stream-push-order.js
@@ -21,7 +21,7 @@ s._read = function(n) {
   }
 };
 
-var v = s.read(0);
+s.read(0);
 
 // ACTUALLY [1, 3, 5, 6, 4, 2]
 
diff --git a/test/parallel/test-stream-unshift-read-race.js b/test/parallel/test-stream-unshift-read-race.js
index 253427e3915103..8239a380def66c 100644
--- a/test/parallel/test-stream-unshift-read-race.js
+++ b/test/parallel/test-stream-unshift-read-race.js
@@ -13,7 +13,6 @@ var stream = require('stream');
 var hwm = 10;
 var r = stream.Readable({ highWaterMark: hwm });
 var chunks = 10;
-var t = (chunks * 5);
 
 var data = new Buffer(chunks * hwm + Math.ceil(hwm / 2));
 for (var i = 0; i < data.length; i++) {
diff --git a/test/parallel/test-stream-writev.js b/test/parallel/test-stream-writev.js
index 88933508fb5246..5b07dd11198e1a 100644
--- a/test/parallel/test-stream-writev.js
+++ b/test/parallel/test-stream-writev.js
@@ -30,11 +30,9 @@ function test(decode, uncork, multi, next) {
   function cnt(msg) {
     expectCount++;
     var expect = expectCount;
-    var called = false;
     return function(er) {
       if (er)
         throw er;
-      called = true;
       counter++;
       assert.equal(counter, expect);
     };
diff --git a/test/parallel/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js
index 3dbee62871c68c..1ee47c03cf0e01 100644
--- a/test/parallel/test-stream2-compatibility.js
+++ b/test/parallel/test-stream2-compatibility.js
@@ -4,7 +4,6 @@ var R = require('_stream_readable');
 var assert = require('assert');
 
 var util = require('util');
-var EE = require('events').EventEmitter;
 
 var ondataCalled = 0;
 
@@ -25,7 +24,7 @@ TestReader.prototype._read = function(n) {
   this._buffer = new Buffer(0);
 };
 
-var reader = new TestReader();
+new TestReader();
 setImmediate(function() {
   assert.equal(ondataCalled, 1);
   console.log('ok');
diff --git a/test/parallel/test-stream2-large-read-stall.js b/test/parallel/test-stream2-large-read-stall.js
index 84457c7e3e9ff7..6a38baac5dacbc 100644
--- a/test/parallel/test-stream2-large-read-stall.js
+++ b/test/parallel/test-stream2-large-read-stall.js
@@ -53,9 +53,6 @@ function push() {
     setTimeout(push);
 }
 
-// start the flow
-var ret = r.read(0);
-
 process.on('exit', function() {
   assert.equal(pushes, PUSHCOUNT + 1);
   assert(endEmitted);
diff --git a/test/parallel/test-stream2-objects.js b/test/parallel/test-stream2-objects.js
index e79b8f9524c494..e67359eff2b29e 100644
--- a/test/parallel/test-stream2-objects.js
+++ b/test/parallel/test-stream2-objects.js
@@ -167,8 +167,6 @@ test('read(0) for object streams', function(t) {
   r.push('foobar');
   r.push(null);
 
-  var v = r.read(0);
-
   r.pipe(toArray(function(array) {
     assert.deepEqual(array, ['foobar']);
 
diff --git a/test/parallel/test-stream2-readable-from-list.js b/test/parallel/test-stream2-readable-from-list.js
index d4b42b60af65a4..ab9d9c5d72cae1 100644
--- a/test/parallel/test-stream2-readable-from-list.js
+++ b/test/parallel/test-stream2-readable-from-list.js
@@ -39,8 +39,6 @@ process.nextTick(run);
 
 
 test('buffers', function(t) {
-  // have a length
-  var len = 16;
   var list = [ new Buffer('foog'),
                new Buffer('bark'),
                new Buffer('bazy'),
@@ -69,8 +67,6 @@ test('buffers', function(t) {
 });
 
 test('strings', function(t) {
-  // have a length
-  var len = 16;
   var list = [ 'foog',
                'bark',
                'bazy',
diff --git a/test/parallel/test-stream2-transform.js b/test/parallel/test-stream2-transform.js
index 7dad5734839791..11ee45915c8395 100644
--- a/test/parallel/test-stream2-transform.js
+++ b/test/parallel/test-stream2-transform.js
@@ -303,13 +303,10 @@ test('passthrough event emission', function(t) {
   var pt = new PassThrough();
   var emits = 0;
   pt.on('readable', function() {
-    var state = pt._readableState;
     console.error('>>> emit readable %d', emits);
     emits++;
   });
 
-  var i = 0;
-
   pt.write(new Buffer('foog'));
 
   console.error('need emit 0');
diff --git a/test/parallel/test-timers-ordering.js b/test/parallel/test-timers-ordering.js
index 5da88967e37dda..cef91e58e78c3d 100644
--- a/test/parallel/test-timers-ordering.js
+++ b/test/parallel/test-timers-ordering.js
@@ -3,13 +3,10 @@ require('../common');
 var assert = require('assert');
 var Timer = process.binding('timer_wrap').Timer;
 
-var i;
-
 var N = 30;
 
 var last_i = 0;
 var last_ts = 0;
-var start = Timer.now();
 
 var f = function(i) {
   if (i <= N) {
diff --git a/test/parallel/test-timers-zero-timeout.js b/test/parallel/test-timers-zero-timeout.js
index 78445ac6596db9..ab0c38f6084277 100644
--- a/test/parallel/test-timers-zero-timeout.js
+++ b/test/parallel/test-timers-zero-timeout.js
@@ -7,7 +7,7 @@ var assert = require('assert');
   var ncalled = 0;
 
   setTimeout(f, 0, 'foo', 'bar', 'baz');
-  var timer = setTimeout(function() {}, 0);
+  setTimeout(function() {}, 0);
 
   function f(a, b, c) {
     assert.equal(a, 'foo');
diff --git a/test/parallel/test-url.js b/test/parallel/test-url.js
index a912b43d820e9f..cd097be24384eb 100644
--- a/test/parallel/test-url.js
+++ b/test/parallel/test-url.js
@@ -1514,9 +1514,6 @@ relativeTests2.forEach(function(relativeTest) {
 //if format and parse are inverse operations then
 //resolveObject(parse(x), y) == parse(resolve(x, y))
 
-//host and hostname are special, in this case a '' value is important
-var emptyIsImportant = {'host': true, 'hostname': ''};
-
 //format: [from, path, expected]
 relativeTests.forEach(function(relativeTest) {
   var actual = url.resolveObject(url.parse(relativeTest[0]), relativeTest[1]),
diff --git a/test/parallel/test-util-decorate-error-stack.js b/test/parallel/test-util-decorate-error-stack.js
index 24fee56df7b655..017a5ab6afe807 100644
--- a/test/parallel/test-util-decorate-error-stack.js
+++ b/test/parallel/test-util-decorate-error-stack.js
@@ -1,6 +1,6 @@
 // Flags: --expose_internals
 'use strict';
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const internalUtil = require('internal/util');
 
diff --git a/test/parallel/test-util-internal.js b/test/parallel/test-util-internal.js
index 9ab883ec8b6dcd..b557356716a004 100644
--- a/test/parallel/test-util-internal.js
+++ b/test/parallel/test-util-internal.js
@@ -1,7 +1,7 @@
 'use strict';
 // Flags: --expose_internals
 
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const internalUtil = require('internal/util');
 

From ef5e9ef0c938e8c9d9b17975bfddf4b6f8c385db Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 23 Dec 2015 11:32:25 -0800
Subject: [PATCH 11/11] tools: implement no-unused-vars for eslint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/4536
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 .eslintrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.eslintrc b/.eslintrc
index bf3fc3378f2d92..33a7919d88c9ef 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -84,6 +84,8 @@ rules:
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#variables
   ## disallow use of undefined variables (globals)
   no-undef: 2
+  ## disallow declaration of variables that are not used in the code
+  no-unused-vars: [2, {"args": "none"}]
 
   # Custom rules in tools/eslint-rules
   require-buffer: 2