From e58ceb3a405b16e7160cb3e10e72de72769719e3 Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 13:41:57 -0400
Subject: [PATCH 1/8] cleanup test-stream-big-packet.js

---
 test/parallel/test-stream-big-packet.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/parallel/test-stream-big-packet.js b/test/parallel/test-stream-big-packet.js
index 8dc910022d2821..8f45926f59194c 100644
--- a/test/parallel/test-stream-big-packet.js
+++ b/test/parallel/test-stream-big-packet.js
@@ -1,10 +1,12 @@
 'use strict';
+
 require('../common');
-var assert = require('assert');
-var util = require('util');
-var stream = require('stream');
 
-var passed = false;
+const assert = require('assert');
+const util = require('util');
+const stream = require('stream');
+
+let passed = false;
 
 function PassThrough() {
   stream.Transform.call(this);
@@ -27,15 +29,15 @@ TestStream.prototype._transform = function(chunk, encoding, done) {
   done();
 };
 
-var s1 = new PassThrough();
-var s2 = new PassThrough();
-var s3 = new TestStream();
+const s1 = new PassThrough();
+const s2 = new PassThrough();
+const s3 = new TestStream();
 s1.pipe(s3);
 // Don't let s2 auto close which may close s3
 s2.pipe(s3, {end: false});
 
 // We must write a buffer larger than highWaterMark
-var big = Buffer.alloc(s1._writableState.highWaterMark + 1, 'x');
+const big = Buffer.alloc(s1._writableState.highWaterMark + 1, 'x');
 
 // Since big is larger than highWaterMark, it will be buffered internally.
 assert(!s1.write(big));

From 5daccd23c71b55f7dd03ef3399138d9f66347c4d Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 13:42:10 -0400
Subject: [PATCH 2/8] cleanup test-stream-big-push.js

---
 test/parallel/test-stream-big-push.js | 28 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/test/parallel/test-stream-big-push.js b/test/parallel/test-stream-big-push.js
index b46665efc94ff5..80a16f2760b1c8 100644
--- a/test/parallel/test-stream-big-push.js
+++ b/test/parallel/test-stream-big-push.js
@@ -1,17 +1,19 @@
 'use strict';
+
 require('../common');
-var assert = require('assert');
-var stream = require('stream');
-var str = 'asdfasdfasdfasdfasdf';
 
-var r = new stream.Readable({
+const assert = require('assert');
+const stream = require('stream');
+const str = 'asdfasdfasdfasdfasdf';
+
+const r = new stream.Readable({
   highWaterMark: 5,
   encoding: 'utf8'
 });
 
-var reads = 0;
-var eofed = false;
-var ended = false;
+let reads = 0;
+let eofed = false;
+let ended = false;
 
 r._read = function(n) {
   if (reads === 0) {
@@ -21,7 +23,7 @@ r._read = function(n) {
     reads++;
   } else if (reads === 1) {
     var ret = r.push(str);
-    assert.equal(ret, false);
+    assert.strictEqual(ret, false);
     reads++;
   } else {
     assert(!eofed);
@@ -40,9 +42,9 @@ var ret = r.push(str);
 // should be false.  > hwm
 assert(!ret);
 var chunk = r.read();
-assert.equal(chunk, str);
+assert.strictEqual(chunk, str);
 chunk = r.read();
-assert.equal(chunk, null);
+assert.strictEqual(chunk, null);
 
 r.once('readable', function() {
   // this time, we'll get *all* the remaining data, because
@@ -50,15 +52,15 @@ r.once('readable', function() {
   // us below the hwm, and so it triggered a _read() again,
   // which synchronously added more, which we then return.
   chunk = r.read();
-  assert.equal(chunk, str + str);
+  assert.strictEqual(chunk, str + str);
 
   chunk = r.read();
-  assert.equal(chunk, null);
+  assert.strictEqual(chunk, null);
 });
 
 process.on('exit', function() {
   assert(eofed);
   assert(ended);
-  assert.equal(reads, 2);
+  assert.strictEqual(reads, 2);
   console.log('ok');
 });

From 076f984af3f098979ac17206d932566d588a05ac Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 13:47:27 -0400
Subject: [PATCH 3/8] cleanup test-stream-duplex.js

---
 test/parallel/test-stream-duplex.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/parallel/test-stream-duplex.js b/test/parallel/test-stream-duplex.js
index 200de24877bf79..553f9e2a55859d 100644
--- a/test/parallel/test-stream-duplex.js
+++ b/test/parallel/test-stream-duplex.js
@@ -1,16 +1,18 @@
 'use strict';
+
 require('../common');
-var assert = require('assert');
 
-var Duplex = require('stream').Transform;
+const assert = require('assert');
+
+const Duplex = require('stream').Transform;
 
-var stream = new Duplex({ objectMode: true });
+const stream = new Duplex({ objectMode: true });
 
 assert(stream._readableState.objectMode);
 assert(stream._writableState.objectMode);
 
-var written;
-var read;
+let written;
+let read;
 
 stream._write = function(obj, _, cb) {
   written = obj;

From abe2a91c77ce02a8fd718e7ce6d0651a255c9be2 Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 13:48:38 -0400
Subject: [PATCH 4/8] cleanup test-stream-end-paused.js

---
 test/parallel/test-stream-end-paused.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/parallel/test-stream-end-paused.js b/test/parallel/test-stream-end-paused.js
index 96a9c4ee132513..3c46d49ea65d65 100644
--- a/test/parallel/test-stream-end-paused.js
+++ b/test/parallel/test-stream-end-paused.js
@@ -1,12 +1,12 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
 
 // Make sure we don't miss the end event for paused 0-length streams
 
-var Readable = require('stream').Readable;
-var stream = new Readable();
-var calledRead = false;
+const Readable = require('stream').Readable;
+const stream = new Readable();
+let calledRead = false;
 stream._read = function() {
   assert(!calledRead);
   calledRead = true;

From 995f48a550f9b6b4ee66e78502881131e0353bec Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 13:49:28 -0400
Subject: [PATCH 5/8] cleanup test-stream-ispaused.js

---
 test/parallel/test-stream-ispaused.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-stream-ispaused.js b/test/parallel/test-stream-ispaused.js
index 38f8da3fd512e4..9bc2667f188d5e 100644
--- a/test/parallel/test-stream-ispaused.js
+++ b/test/parallel/test-stream-ispaused.js
@@ -1,10 +1,11 @@
 'use strict';
+
 require('../common');
-var assert = require('assert');
 
-var stream = require('stream');
+const assert = require('assert');
+const stream = require('stream');
 
-var readable = new stream.Readable();
+const readable = new stream.Readable();
 
 // _read is a noop, here.
 readable._read = Function();

From 8862e13b36b4b21d2a6a344389bda83d53714a7e Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 13:51:25 -0400
Subject: [PATCH 6/8] cleanup test-stream-pipe-after-end.js

---
 test/parallel/test-stream-pipe-after-end.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/parallel/test-stream-pipe-after-end.js b/test/parallel/test-stream-pipe-after-end.js
index 258c9330a96018..9f155b359143ec 100644
--- a/test/parallel/test-stream-pipe-after-end.js
+++ b/test/parallel/test-stream-pipe-after-end.js
@@ -1,10 +1,11 @@
 'use strict';
+
 require('../common');
-var assert = require('assert');
 
-var Readable = require('_stream_readable');
-var Writable = require('_stream_writable');
-var util = require('util');
+const assert = require('assert');
+const Readable = require('_stream_readable');
+const Writable = require('_stream_writable');
+const util = require('util');
 
 util.inherits(TestReadable, Readable);
 function TestReadable(opt) {
@@ -35,11 +36,11 @@ TestWritable.prototype._write = function(chunk, encoding, cb) {
 };
 
 // this one should not emit 'end' until we read() from it later.
-var ender = new TestReadable();
-var enderEnded = false;
+const ender = new TestReadable();
+let enderEnded = false;
 
 // what happens when you pipe() a Readable that's already ended?
-var piper = new TestReadable();
+const piper = new TestReadable();
 // pushes EOF null, and length=0, so this will trigger 'end'
 piper.read();
 
@@ -48,11 +49,11 @@ setTimeout(function() {
     enderEnded = true;
   });
   assert(!enderEnded);
-  var c = ender.read();
+  const c = ender.read();
   assert.equal(c, null);
 
-  var w = new TestWritable();
-  var writableFinished = false;
+  const w = new TestWritable();
+  let writableFinished = false;
   w.on('finish', function() {
     writableFinished = true;
   });

From 832d9ba8cce230b36fe036960f0570a3bf964764 Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 13:58:23 -0400
Subject: [PATCH 7/8] cleanup test-stream-pipe-cleanup.js

---
 test/parallel/test-stream-pipe-cleanup.js | 72 ++++++++++++-----------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/test/parallel/test-stream-pipe-cleanup.js b/test/parallel/test-stream-pipe-cleanup.js
index 251695c9f723ab..9242356ac57555 100644
--- a/test/parallel/test-stream-pipe-cleanup.js
+++ b/test/parallel/test-stream-pipe-cleanup.js
@@ -3,9 +3,10 @@
 // hanging on the source or dest.
 
 require('../common');
-var stream = require('stream');
-var assert = require('assert');
-var util = require('util');
+
+const stream = require('stream');
+const assert = require('assert');
+const util = require('util');
 
 function Writable() {
   this.writable = true;
@@ -33,20 +34,20 @@ function Duplex() {
 }
 util.inherits(Duplex, Writable);
 
-var i = 0;
-var limit = 100;
+let i = 0;
+const limit = 100;
 
-var w = new Writable();
+let w = new Writable();
 
-var r;
+let r;
 
 for (i = 0; i < limit; i++) {
   r = new Readable();
   r.pipe(w);
   r.emit('end');
 }
-assert.equal(0, r.listeners('end').length);
-assert.equal(limit, w.endCalls);
+assert.strictEqual(0, r.listeners('end').length);
+assert.strictEqual(limit, w.endCalls);
 
 w.endCalls = 0;
 
@@ -55,8 +56,8 @@ for (i = 0; i < limit; i++) {
   r.pipe(w);
   r.emit('close');
 }
-assert.equal(0, r.listeners('close').length);
-assert.equal(limit, w.endCalls);
+assert.strictEqual(0, r.listeners('close').length);
+assert.strictEqual(limit, w.endCalls);
 
 w.endCalls = 0;
 
@@ -67,36 +68,37 @@ for (i = 0; i < limit; i++) {
   r.pipe(w);
   w.emit('close');
 }
-assert.equal(0, w.listeners('close').length);
+assert.strictEqual(0, w.listeners('close').length);
 
 r = new Readable();
 w = new Writable();
-var d = new Duplex();
+const d = new Duplex();
 r.pipe(d); // pipeline A
 d.pipe(w); // pipeline B
-assert.equal(r.listeners('end').length, 2);   // A.onend, A.cleanup
-assert.equal(r.listeners('close').length, 2); // A.onclose, A.cleanup
-assert.equal(d.listeners('end').length, 2);   // B.onend, B.cleanup
-assert.equal(d.listeners('close').length, 3); // A.cleanup, B.onclose, B.cleanup
-assert.equal(w.listeners('end').length, 0);
-assert.equal(w.listeners('close').length, 1); // B.cleanup
+assert.strictEqual(r.listeners('end').length, 2);   // A.onend, A.cleanup
+assert.strictEqual(r.listeners('close').length, 2); // A.onclose, A.cleanup
+assert.strictEqual(d.listeners('end').length, 2);   // B.onend, B.cleanup
+// A.cleanup, B.onclose, B.cleanup
+assert.strictEqual(d.listeners('close').length, 3);
+assert.strictEqual(w.listeners('end').length, 0);
+assert.strictEqual(w.listeners('close').length, 1); // B.cleanup
 
 r.emit('end');
-assert.equal(d.endCalls, 1);
-assert.equal(w.endCalls, 0);
-assert.equal(r.listeners('end').length, 0);
-assert.equal(r.listeners('close').length, 0);
-assert.equal(d.listeners('end').length, 2);   // B.onend, B.cleanup
-assert.equal(d.listeners('close').length, 2); // B.onclose, B.cleanup
-assert.equal(w.listeners('end').length, 0);
-assert.equal(w.listeners('close').length, 1); // B.cleanup
+assert.strictEqual(d.endCalls, 1);
+assert.strictEqual(w.endCalls, 0);
+assert.strictEqual(r.listeners('end').length, 0);
+assert.strictEqual(r.listeners('close').length, 0);
+assert.strictEqual(d.listeners('end').length, 2);   // B.onend, B.cleanup
+assert.strictEqual(d.listeners('close').length, 2); // B.onclose, B.cleanup
+assert.strictEqual(w.listeners('end').length, 0);
+assert.strictEqual(w.listeners('close').length, 1); // B.cleanup
 
 d.emit('end');
-assert.equal(d.endCalls, 1);
-assert.equal(w.endCalls, 1);
-assert.equal(r.listeners('end').length, 0);
-assert.equal(r.listeners('close').length, 0);
-assert.equal(d.listeners('end').length, 0);
-assert.equal(d.listeners('close').length, 0);
-assert.equal(w.listeners('end').length, 0);
-assert.equal(w.listeners('close').length, 0);
+assert.strictEqual(d.endCalls, 1);
+assert.strictEqual(w.endCalls, 1);
+assert.strictEqual(r.listeners('end').length, 0);
+assert.strictEqual(r.listeners('close').length, 0);
+assert.strictEqual(d.listeners('end').length, 0);
+assert.strictEqual(d.listeners('close').length, 0);
+assert.strictEqual(w.listeners('end').length, 0);
+assert.strictEqual(w.listeners('close').length, 0);

From 837d02f5fcded89deac7c44866ee61d442cc3da4 Mon Sep 17 00:00:00 2001
From: "Italo A. Casas" <me@italoacasas.com>
Date: Tue, 20 Sep 2016 16:40:36 -0400
Subject: [PATCH 8/8] fixing extra space

---
 test/parallel/test-stream-big-packet.js     | 2 --
 test/parallel/test-stream-big-push.js       | 2 --
 test/parallel/test-stream-duplex.js         | 3 ---
 test/parallel/test-stream-ispaused.js       | 2 --
 test/parallel/test-stream-pipe-after-end.js | 2 --
 test/parallel/test-stream-pipe-cleanup.js   | 2 --
 6 files changed, 13 deletions(-)

diff --git a/test/parallel/test-stream-big-packet.js b/test/parallel/test-stream-big-packet.js
index 8f45926f59194c..8e5af3ea4ba342 100644
--- a/test/parallel/test-stream-big-packet.js
+++ b/test/parallel/test-stream-big-packet.js
@@ -1,7 +1,5 @@
 'use strict';
-
 require('../common');
-
 const assert = require('assert');
 const util = require('util');
 const stream = require('stream');
diff --git a/test/parallel/test-stream-big-push.js b/test/parallel/test-stream-big-push.js
index 80a16f2760b1c8..d9b79ebafc1d08 100644
--- a/test/parallel/test-stream-big-push.js
+++ b/test/parallel/test-stream-big-push.js
@@ -1,7 +1,5 @@
 'use strict';
-
 require('../common');
-
 const assert = require('assert');
 const stream = require('stream');
 const str = 'asdfasdfasdfasdfasdf';
diff --git a/test/parallel/test-stream-duplex.js b/test/parallel/test-stream-duplex.js
index 553f9e2a55859d..3760960ac9346c 100644
--- a/test/parallel/test-stream-duplex.js
+++ b/test/parallel/test-stream-duplex.js
@@ -1,9 +1,6 @@
 'use strict';
-
 require('../common');
-
 const assert = require('assert');
-
 const Duplex = require('stream').Transform;
 
 const stream = new Duplex({ objectMode: true });
diff --git a/test/parallel/test-stream-ispaused.js b/test/parallel/test-stream-ispaused.js
index 9bc2667f188d5e..f25e717b2b7be9 100644
--- a/test/parallel/test-stream-ispaused.js
+++ b/test/parallel/test-stream-ispaused.js
@@ -1,7 +1,5 @@
 'use strict';
-
 require('../common');
-
 const assert = require('assert');
 const stream = require('stream');
 
diff --git a/test/parallel/test-stream-pipe-after-end.js b/test/parallel/test-stream-pipe-after-end.js
index 9f155b359143ec..1193db21835cb1 100644
--- a/test/parallel/test-stream-pipe-after-end.js
+++ b/test/parallel/test-stream-pipe-after-end.js
@@ -1,7 +1,5 @@
 'use strict';
-
 require('../common');
-
 const assert = require('assert');
 const Readable = require('_stream_readable');
 const Writable = require('_stream_writable');
diff --git a/test/parallel/test-stream-pipe-cleanup.js b/test/parallel/test-stream-pipe-cleanup.js
index 9242356ac57555..b28b99b772af26 100644
--- a/test/parallel/test-stream-pipe-cleanup.js
+++ b/test/parallel/test-stream-pipe-cleanup.js
@@ -1,9 +1,7 @@
 'use strict';
 // This test asserts that Stream.prototype.pipe does not leave listeners
 // hanging on the source or dest.
-
 require('../common');
-
 const stream = require('stream');
 const assert = require('assert');
 const util = require('util');