From 01afa9bc0702439b5ca8fdceb0e08d36d7c235a9 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 8 Dec 2018 06:17:09 -0800
Subject: [PATCH] Revert "stream: make `.destroy()` interact better with write
 queue"

This reverts commit d3f02d0da3d574b91a15d3ace10e76014b7574fc.

Fixes: https://github.com/nodejs/node/issues/24456
---
 lib/_stream_writable.js                    |  2 +-
 test/parallel/test-stream-write-destroy.js | 59 ----------------------
 2 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 test/parallel/test-stream-write-destroy.js

diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index c2f5a5ec4ac9d1..dfec3f2d9c8173 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -461,7 +461,7 @@ function onwrite(stream, er) {
     onwriteError(stream, state, sync, er, cb);
   else {
     // Check if we're actually ready to finish, but don't emit yet
-    var finished = needFinish(state) || stream.destroyed;
+    var finished = needFinish(state);
 
     if (!finished &&
         !state.corked &&
diff --git a/test/parallel/test-stream-write-destroy.js b/test/parallel/test-stream-write-destroy.js
deleted file mode 100644
index 83b329a6a8a7b3..00000000000000
--- a/test/parallel/test-stream-write-destroy.js
+++ /dev/null
@@ -1,59 +0,0 @@
-'use strict';
-require('../common');
-const assert = require('assert');
-const { Writable } = require('stream');
-
-// Test interaction between calling .destroy() on a writable and pending
-// writes.
-
-for (const withPendingData of [ false, true ]) {
-  for (const useEnd of [ false, true ]) {
-    const callbacks = [];
-
-    const w = new Writable({
-      write(data, enc, cb) {
-        callbacks.push(cb);
-      },
-      // Effectively disable the HWM to observe 'drain' events more easily.
-      highWaterMark: 1
-    });
-
-    let chunksWritten = 0;
-    let drains = 0;
-    let finished = false;
-    w.on('drain', () => drains++);
-    w.on('finish', () => finished = true);
-
-    w.write('abc', () => chunksWritten++);
-    assert.strictEqual(chunksWritten, 0);
-    assert.strictEqual(drains, 0);
-    callbacks.shift()();
-    assert.strictEqual(chunksWritten, 1);
-    assert.strictEqual(drains, 1);
-
-    if (withPendingData) {
-      // Test 2 cases: There either is or is not data still in the write queue.
-      // (The second write will never actually get executed either way.)
-      w.write('def', () => chunksWritten++);
-    }
-    if (useEnd) {
-      // Again, test 2 cases: Either we indicate that we want to end the
-      // writable or not.
-      w.end('ghi', () => chunksWritten++);
-    } else {
-      w.write('ghi', () => chunksWritten++);
-    }
-
-    assert.strictEqual(chunksWritten, 1);
-    w.destroy();
-    assert.strictEqual(chunksWritten, 1);
-    callbacks.shift()();
-    assert.strictEqual(chunksWritten, 2);
-    assert.strictEqual(callbacks.length, 0);
-    assert.strictEqual(drains, 1);
-
-    // When we used `.end()`, we see the 'finished' event if and only if
-    // we actually finished processing the write queue.
-    assert.strictEqual(finished, !withPendingData && useEnd);
-  }
-}