From c701c1311e3c01244bd9500947e954103e89f079 Mon Sep 17 00:00:00 2001 From: "Dejon \"DJ\" Gill" Date: Sat, 19 Nov 2016 14:31:17 -0800 Subject: [PATCH 1/6] Refactored to es6 Changed var to const, assert.equal to assert.strictEqual --- test/parallel/test-fs-empty-readStream.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/parallel/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js index 858d07e4f0b982..fabea0655e31cc 100644 --- a/test/parallel/test-fs-empty-readStream.js +++ b/test/parallel/test-fs-empty-readStream.js @@ -7,6 +7,7 @@ const fs = require('fs'); const emptyFile = path.join(common.fixturesDir, 'empty.txt'); fs.open(emptyFile, 'r', common.mustCall((error, fd) => { + assert.ifError(error); const read = fs.createReadStream(emptyFile, { 'fd': fd }); @@ -19,6 +20,7 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => { })); fs.open(emptyFile, 'r', common.mustCall((error, fd) => { + assert.ifError(error); const read = fs.createReadStream(emptyFile, { 'fd': fd }); From 54ccfa211ea3b79eb5dd8e8926e38feedd1c1776 Mon Sep 17 00:00:00 2001 From: "Dejon \"DJ\" Gill" Date: Sun, 20 Nov 2016 11:21:12 -0800 Subject: [PATCH 2/6] test: es6 update, replace throw with common.fail Replaced anonymous functions with arrow functions. Replaced throw new Error with common.fail. --- test/parallel/test-fs-empty-readStream.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js index fabea0655e31cc..1b73fae4c4d4b3 100644 --- a/test/parallel/test-fs-empty-readStream.js +++ b/test/parallel/test-fs-empty-readStream.js @@ -13,7 +13,7 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => { const read = fs.createReadStream(emptyFile, { 'fd': fd }); read.once('data', () => { - throw new Error('data event should not emit'); + common.fail('data event should not emit'); }); read.once('end', common.mustCall(function endEvent1() {})); @@ -23,15 +23,15 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => { assert.ifError(error); - const read = fs.createReadStream(emptyFile, { 'fd': fd }); + const read = fs.createReadStream(emptyFile, { fd }); read.pause(); read.once('data', () => { - throw new Error('data event should not emit'); + common.fail('data event should not emit'); }); read.once('end', function endEvent2() { - throw new Error('end event should not emit'); + common.fail('end event should not emit'); }); setTimeout(common.mustCall(() => { From 9464b1d6f886b9df7c22cb52d3ba8016f4c483d7 Mon Sep 17 00:00:00 2001 From: DejonGill Date: Mon, 21 Nov 2016 20:43:50 -0800 Subject: [PATCH 3/6] test: es6 update, replace throw with common.fail Replaced anonymous functions with arrow functions. Replaced throw new Error with common.fail. --- test/parallel/test-fs-empty-readStream.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/parallel/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js index 1b73fae4c4d4b3..cc09517590cdc7 100644 --- a/test/parallel/test-fs-empty-readStream.js +++ b/test/parallel/test-fs-empty-readStream.js @@ -10,7 +10,7 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => { assert.ifError(error); - const read = fs.createReadStream(emptyFile, { 'fd': fd }); + const read = fs.createReadStream(emptyFile, { fd }); read.once('data', () => { common.fail('data event should not emit'); @@ -24,6 +24,7 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => { assert.ifError(error); const read = fs.createReadStream(emptyFile, { fd }); + read.pause(); read.once('data', () => { From b2048bb9b19fccbee409e1095904e1c9546b6b3d Mon Sep 17 00:00:00 2001 From: "Dejon \"DJ\" Gill" Date: Sat, 19 Nov 2016 14:31:17 -0800 Subject: [PATCH 4/6] Refactored to es6 Changed var to const, assert.equal to assert.strictEqual --- test/parallel/test-fs-empty-readStream.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/parallel/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js index cc09517590cdc7..247cf29034f347 100644 --- a/test/parallel/test-fs-empty-readStream.js +++ b/test/parallel/test-fs-empty-readStream.js @@ -6,6 +6,7 @@ const fs = require('fs'); const emptyFile = path.join(common.fixturesDir, 'empty.txt'); + fs.open(emptyFile, 'r', common.mustCall((error, fd) => { assert.ifError(error); From 9baa222ed87c02e3338bd16476bf181fc5fe1d37 Mon Sep 17 00:00:00 2001 From: "Dejon \"DJ\" Gill" Date: Sun, 20 Nov 2016 11:21:12 -0800 Subject: [PATCH 5/6] test: es6 update, replace throw with common.fail Replaced anonymous functions with arrow functions. Replaced throw new Error with common.fail. --- test/parallel/test-fs-empty-readStream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js index 247cf29034f347..e030bee1f08414 100644 --- a/test/parallel/test-fs-empty-readStream.js +++ b/test/parallel/test-fs-empty-readStream.js @@ -25,7 +25,7 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => { assert.ifError(error); const read = fs.createReadStream(emptyFile, { fd }); - + read.pause(); read.once('data', () => { From 6b3e7efbd754d71fe892fbdc03a0211d7fa9ddb9 Mon Sep 17 00:00:00 2001 From: DejonGill Date: Thu, 15 Dec 2016 22:09:19 -0800 Subject: [PATCH 6/6] wrapped callbacks in common.mustCall --- test/parallel/test-fs-empty-readStream.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/parallel/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js index e030bee1f08414..268382054925d0 100644 --- a/test/parallel/test-fs-empty-readStream.js +++ b/test/parallel/test-fs-empty-readStream.js @@ -6,7 +6,6 @@ const fs = require('fs'); const emptyFile = path.join(common.fixturesDir, 'empty.txt'); - fs.open(emptyFile, 'r', common.mustCall((error, fd) => { assert.ifError(error); @@ -38,5 +37,5 @@ fs.open(emptyFile, 'r', common.mustCall((error, fd) => { setTimeout(common.mustCall(() => { assert.strictEqual(read.isPaused(), true); - }), common.platformTimeout(50)); + }, common.platformTimeout(50)); }));