streams2: pause() should be immediate

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index a0cb13c..6c4d95e 100644 (file)
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -521,15 +521,13 @@ Readable.prototype.addListener = Readable.prototype.on;
 // If the user uses them, then switch into old mode.
 Readable.prototype.resume = function() {
   emitDataEvents(this);
-  return this.resume();
 };
 
 Readable.prototype.pause = function() {
-  emitDataEvents(this);
-  return this.pause();
+  emitDataEvents(this, true);
 };
 
-function emitDataEvents(stream) {
+function emitDataEvents(stream, startPaused) {
   var state = stream._readableState;
 
   if (state.flowing) {
@@ -537,7 +535,7 @@ function emitDataEvents(stream) {
     throw new Error('Cannot switch to old mode now.');
   }
 
-  var paused = false;
+  var paused = startPaused || false;
   var readable = false;
 
   // convert to an old-style stream.

diff --git a/test/simple/test-fs-empty-readStream.js b/test/simple/test-fs-empty-readStream.js
index a9b378f..d181c21 100644 (file)
--- a/test/simple/test-fs-empty-readStream.js
+++ b/test/simple/test-fs-empty-readStream.js
@@ -32,12 +32,13 @@ fs.open(emptyFile, 'r', function (error, fd) {
   var read = fs.createReadStream(emptyFile, { 'fd': fd });
 
   read.once('data', function () {
-    throw new Error("data event should not emit");
+    throw new Error('data event should not emit');
   });
 
   var readEmit = false;
   read.once('end', function () {
     readEmit = true;
+    console.error('end event 1');
   });
 
   setTimeout(function () {
@@ -52,12 +53,13 @@ fs.open(emptyFile, 'r', function (error, fd) {
   read.pause();
 
   read.once('data', function () {
-    throw new Error("data event should not emit");
+    throw new Error('data event should not emit');
   });
 
   var readEmit = false;
   read.once('end', function () {
     readEmit = true;
+    console.error('end event 2');
   });
 
   setTimeout(function () {