From 0babd181a0c5d775e62a12b3b04fe4d7654fe80a Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 12 Dec 2017 11:34:17 -0800 Subject: http2: cleanup Http2Stream/Http2Session destroy PR-URL: https://github.com/nodejs/node/pull/17406 Reviewed-By: Matteo Collina Reviewed-By: Anna Henningsen Reviewed-By: Anatoli Papirovski This is a significant cleanup and refactoring of the cleanup/close/destroy logic for Http2Stream and Http2Session. There are significant changes here in the timing and ordering of cleanup logic, JS apis. and various related necessary edits. --- .../test-http2-misbehaving-flow-control-paused.js | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'test/parallel/test-http2-misbehaving-flow-control-paused.js') diff --git a/test/parallel/test-http2-misbehaving-flow-control-paused.js b/test/parallel/test-http2-misbehaving-flow-control-paused.js index ee799b1d5a..0b7299d5ac 100644 --- a/test/parallel/test-http2-misbehaving-flow-control-paused.js +++ b/test/parallel/test-http2-misbehaving-flow-control-paused.js @@ -56,32 +56,24 @@ let client; const server = h2.createServer({ settings: { initialWindowSize: 36 } }); server.on('stream', (stream) => { - - // Not reading causes the flow control window to get backed up. stream.pause(); - - stream.on('error', common.mustCall((err) => { - common.expectsError({ - code: 'ERR_HTTP2_STREAM_ERROR', - type: Error, - message: 'Stream closed with error code 3' - })(err); + stream.on('error', common.expectsError({ + code: 'ERR_HTTP2_STREAM_ERROR', + type: Error, + message: 'Stream closed with error code 3' + })); + stream.on('close', common.mustCall(() => { server.close(); client.destroy(); })); - stream.on('end', common.mustNotCall()); - stream.respond(); stream.end('ok'); }); server.listen(0, () => { client = net.connect(server.address().port, () => { - client.on('error', console.log); - client.write(preamble); - client.write(data); client.write(data); client.write(data); -- cgit v1.2.1