From 0f7541073c014ba7dc8aa9ebdd477def1f8d3bb2 Mon Sep 17 00:00:00 2001
From: Hristijan Gjorgjievski <hristijan_kiko123@hotmail.com>
Date: Wed, 6 Jun 2018 13:02:16 +1000
Subject: [PATCH 1/2] test: improve assert error messages

Improve the assert error message so it includes actual value in
the error message.
---
 test/parallel/test-stream-pipe-await-drain.js | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/parallel/test-stream-pipe-await-drain.js b/test/parallel/test-stream-pipe-await-drain.js
index 5bdf48008479e7..b22e28f0e6ecb6 100644
--- a/test/parallel/test-stream-pipe-await-drain.js
+++ b/test/parallel/test-stream-pipe-await-drain.js
@@ -23,8 +23,12 @@ writer1._write = common.mustCall(function(chunk, encoding, cb) {
 }, 1);
 
 writer1.once('chunk-received', function() {
-  assert.strictEqual(reader._readableState.awaitDrain, 0,
-                     'initial value is not 0');
+  assert.strictEqual(
+    reader._readableState.awaitDrain,
+    0,
+    'awaitDrain initial value should be 0, actual is ' +
+    `${reader._readableState.awaitDrain}`
+  );
   setImmediate(function() {
     // This one should *not* get through to writer1 because writer2 is not
     // "done" processing.
@@ -35,8 +39,10 @@ writer1.once('chunk-received', function() {
 // A "slow" consumer:
 writer2._write = common.mustCall(function(chunk, encoding, cb) {
   assert.strictEqual(
-    reader._readableState.awaitDrain, 1,
-    'awaitDrain isn\'t 1 after first push'
+    reader._readableState.awaitDrain,
+    1,
+    'awaitDrain should be 1 after first push, actual is ' +
+    `${reader._readableState.awaitDrain}`
   );
   // Not calling cb here to "simulate" slow stream.
   // This should be called exactly once, since the first .write() call
@@ -45,8 +51,10 @@ writer2._write = common.mustCall(function(chunk, encoding, cb) {
 
 writer3._write = common.mustCall(function(chunk, encoding, cb) {
   assert.strictEqual(
-    reader._readableState.awaitDrain, 2,
-    'awaitDrain isn\'t 2 after second push'
+    reader._readableState.awaitDrain,
+    2,
+    'awaitDrain should be 2 after second push, actual is ' +
+    `${reader._readableState.awaitDrain}`
   );
   // Not calling cb here to "simulate" slow stream.
   // This should be called exactly once, since the first .write() call

From 132b789574d45f0c4b3840cbd612819b46d3d000 Mon Sep 17 00:00:00 2001
From: Hristijan Gjorgjievski <hristijan_kiko123@hotmail.com>
Date: Thu, 7 Jun 2018 13:12:34 +1000
Subject: [PATCH 2/2] test: remove unnecessary string template

Remove unnecessary string templates around the values of the assert
message.
---
 test/parallel/test-stream-pipe-await-drain.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-stream-pipe-await-drain.js b/test/parallel/test-stream-pipe-await-drain.js
index b22e28f0e6ecb6..53cf54940d34e1 100644
--- a/test/parallel/test-stream-pipe-await-drain.js
+++ b/test/parallel/test-stream-pipe-await-drain.js
@@ -27,7 +27,7 @@ writer1.once('chunk-received', function() {
     reader._readableState.awaitDrain,
     0,
     'awaitDrain initial value should be 0, actual is ' +
-    `${reader._readableState.awaitDrain}`
+    reader._readableState.awaitDrain
   );
   setImmediate(function() {
     // This one should *not* get through to writer1 because writer2 is not
@@ -42,7 +42,7 @@ writer2._write = common.mustCall(function(chunk, encoding, cb) {
     reader._readableState.awaitDrain,
     1,
     'awaitDrain should be 1 after first push, actual is ' +
-    `${reader._readableState.awaitDrain}`
+    reader._readableState.awaitDrain
   );
   // Not calling cb here to "simulate" slow stream.
   // This should be called exactly once, since the first .write() call
@@ -54,7 +54,7 @@ writer3._write = common.mustCall(function(chunk, encoding, cb) {
     reader._readableState.awaitDrain,
     2,
     'awaitDrain should be 2 after second push, actual is ' +
-    `${reader._readableState.awaitDrain}`
+    reader._readableState.awaitDrain
   );
   // Not calling cb here to "simulate" slow stream.
   // This should be called exactly once, since the first .write() call