From 78e8aa81c9aeb43b61295610f520560e47b9653f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 27 Dec 2016 22:33:08 -0800 Subject: [PATCH] test: refactor test-stream-pipe-after-end MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * replace `process.on('exit', ...)` checks with `common.mustCall()` * assert.equal() -> assert.strictEqual() * provide duration of 1ms to timer without a duration * remove unused function argument PR-URL: https://github.com/nodejs/node/pull/10483 Reviewed-By: James M Snell Reviewed-By: Michaƫl Zasso Reviewed-By: Colin Ihrig Reviewed-By: Italo A. Casas --- test/parallel/test-stream-pipe-after-end.js | 27 ++++++--------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/test/parallel/test-stream-pipe-after-end.js b/test/parallel/test-stream-pipe-after-end.js index 1193db21835cb1..79ebb2c0e0990d 100644 --- a/test/parallel/test-stream-pipe-after-end.js +++ b/test/parallel/test-stream-pipe-after-end.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const Readable = require('_stream_readable'); const Writable = require('_stream_writable'); @@ -13,7 +13,7 @@ function TestReadable(opt) { this._ended = false; } -TestReadable.prototype._read = function(n) { +TestReadable.prototype._read = function() { if (this._ended) this.emit('error', new Error('_read called twice')); this._ended = true; @@ -35,31 +35,18 @@ TestWritable.prototype._write = function(chunk, encoding, cb) { // this one should not emit 'end' until we read() from it later. const ender = new TestReadable(); -let enderEnded = false; // what happens when you pipe() a Readable that's already ended? const piper = new TestReadable(); // pushes EOF null, and length=0, so this will trigger 'end' piper.read(); -setTimeout(function() { - ender.on('end', function() { - enderEnded = true; - }); - assert(!enderEnded); +setTimeout(common.mustCall(function() { + ender.on('end', common.mustCall(function() {})); const c = ender.read(); - assert.equal(c, null); + assert.strictEqual(c, null); const w = new TestWritable(); - let writableFinished = false; - w.on('finish', function() { - writableFinished = true; - }); + w.on('finish', common.mustCall(function() {})); piper.pipe(w); - - process.on('exit', function() { - assert(enderEnded); - assert(writableFinished); - console.log('ok'); - }); -}); +}), 1);