nodejs
diff --git a/Collapse file
‎lib/internal/streams/writable.js‎
Copy file name to clipboardExpand all lines: lib/internal/streams/writable.js
+5-3Lines changed: 5 additions & 3 deletions b/Collapse file
‎lib/internal/streams/writable.js‎
Copy file name to clipboardExpand all lines: lib/internal/streams/writable.js
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/Collapse file
‎test/parallel/test-stream-writable-end-cb-error.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-stream-writable-end-cb-error.js
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎test/parallel/test-stream-writable-end-cb-error.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-stream-writable-end-cb-error.js
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎test/parallel/test-stream2-writable.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-stream2-writable.js
+8-3Lines changed: 8 additions & 3 deletions b/Collapse file
‎test/parallel/test-stream2-writable.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-stream2-writable.js
+8-3Lines changed: 8 additions & 3 deletions
@@ -497,7 +497,7 @@ function afterWrite(stream, state, count, cb) {
 
   while (count-- > 0) {
     state.pendingcb--;
-    cb();
+    cb(null);
   }
 
   if (state.destroyed) {
@@ -640,8 +640,10 @@ Writable.prototype.end = function(chunk, encoding, cb) {
   }
 
   if (typeof cb === 'function') {
-    if (err || state.finished) {
+    if (err) {
       process.nextTick(cb, err);
+    } else if (state.finished) {
+      process.nextTick(cb, null);
     } else {
       state[kOnFinished].push(cb);
     }
@@ -742,7 +744,7 @@ function finish(stream, state) {
 
   const onfinishCallbacks = state[kOnFinished].splice(0);
   for (let i = 0; i < onfinishCallbacks.length; i++) {
-    onfinishCallbacks[i]();
+    onfinishCallbacks[i](null);
   }
 
   stream.emit('finish');
 
@@ -36,7 +36,7 @@ const stream = require('stream');
   let called = false;
   writable.end('asd', common.mustCall((err) => {
     called = true;
-    assert.strictEqual(err, undefined);
+    assert.strictEqual(err, null);
   }));
 
   writable.on('error', common.mustCall((err) => {
 
@@ -194,7 +194,8 @@ for (let i = 0; i < chunks.length; i++) {
 {
   // Verify write callbacks
   const callbacks = chunks.map(function(chunk, i) {
-    return [i, function() {
+    return [i, function(err) {
+      assert.strictEqual(err, null);
       callbacks._called[i] = chunk;
     }];
   }).reduce(function(set, x) {
@@ -225,15 +226,19 @@ for (let i = 0; i < chunks.length; i++) {
 {
   // Verify end() callback
   const tw = new TestWriter();
-  tw.end(common.mustCall());
+  tw.end(common.mustCall(function(err) {
+    assert.strictEqual(err, null);
+  }));
 }
 
 const helloWorldBuffer = Buffer.from('hello world');
 
 {
   // Verify end() callback with chunk
   const tw = new TestWriter();
-  tw.end(helloWorldBuffer, common.mustCall());
+  tw.end(helloWorldBuffer, common.mustCall(function(err) {
+    assert.strictEqual(err, null);
+  }));
 }
 
 {
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ for (let i = 0; i < chunks.length; i++) {`
`194`	`194`	`{`
`195`	`195`	`// Verify write callbacks`
`196`	`196`	`const callbacks = chunks.map(function(chunk, i) {`
`197`		`- return [i, function() {`
	`197`	`+ return [i, function(err) {`
	`198`	`+ assert.strictEqual(err, null);`
`198`	`199`	`callbacks._called[i] = chunk;`
`199`	`200`	`}];`
`200`	`201`	`}).reduce(function(set, x) {`
`@@ -225,15 +226,19 @@ for (let i = 0; i < chunks.length; i++) {`
`225`	`226`	`{`
`226`	`227`	`// Verify end() callback`
`227`	`228`	`const tw = new TestWriter();`
`228`		`- tw.end(common.mustCall());`
	`229`	`+ tw.end(common.mustCall(function(err) {`
	`230`	`+ assert.strictEqual(err, null);`
	`231`	`+ }));`
`229`	`232`	`}`
`230`	`233`
`231`	`234`	`const helloWorldBuffer = Buffer.from('hello world');`
`232`	`235`
`233`	`236`	`{`
`234`	`237`	`// Verify end() callback with chunk`
`235`	`238`	`const tw = new TestWriter();`
`236`		`- tw.end(helloWorldBuffer, common.mustCall());`
	`239`	`+ tw.end(helloWorldBuffer, common.mustCall(function(err) {`
	`240`	`+ assert.strictEqual(err, null);`
	`241`	`+ }));`
`237`	`242`	`}`
`238`	`243`
`239`	`244`	`{`