diff options
author | James M Snell <jasnell@gmail.com> | 2017-12-12 11:34:17 -0800 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-12-18 10:19:21 -0800 |
commit | 0babd181a0c5d775e62a12b3b04fe4d7654fe80a (patch) | |
tree | cf02bdb6a71b8d346109d1ab66e18c559dbf5a23 /test/parallel/test-http2-options-max-headers-block-length.js | |
parent | 18ca0b64422337cc6844949b9b97f39fef82f512 (diff) | |
download | android-node-v8-0babd181a0c5d775e62a12b3b04fe4d7654fe80a.tar.gz android-node-v8-0babd181a0c5d775e62a12b3b04fe4d7654fe80a.tar.bz2 android-node-v8-0babd181a0c5d775e62a12b3b04fe4d7654fe80a.zip |
http2: cleanup Http2Stream/Http2Session destroy
PR-URL: https://github.com/nodejs/node/pull/17406
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
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.
Diffstat (limited to 'test/parallel/test-http2-options-max-headers-block-length.js')
-rw-r--r-- | test/parallel/test-http2-options-max-headers-block-length.js | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/test/parallel/test-http2-options-max-headers-block-length.js b/test/parallel/test-http2-options-max-headers-block-length.js index 402803dd33..a728c28c65 100644 --- a/test/parallel/test-http2-options-max-headers-block-length.js +++ b/test/parallel/test-http2-options-max-headers-block-length.js @@ -10,9 +10,7 @@ const server = h2.createServer(); // we use the lower-level API here server.on('stream', common.mustNotCall()); -server.listen(0); - -server.on('listening', common.mustCall(() => { +server.listen(0, common.mustCall(() => { // Setting the maxSendHeaderBlockLength, then attempting to send a // headers block that is too big should cause a 'frameError' to @@ -24,13 +22,13 @@ server.on('listening', common.mustCall(() => { const client = h2.connect(`http://localhost:${server.address().port}`, options); - const req = client.request({ ':path': '/' }); - + const req = client.request(); req.on('response', common.mustNotCall()); req.resume(); - req.on('end', common.mustCall(() => { - client.destroy(); + req.on('close', common.mustCall(() => { + client.close(); + server.close(); })); req.on('frameError', common.mustCall((type, code) => { @@ -42,33 +40,4 @@ server.on('listening', common.mustCall(() => { type: Error, message: 'Stream closed with error code 7' })); - - req.end(); - - // if no frameError listener, should emit 'error' with - // code ERR_HTTP2_FRAME_ERROR - const req2 = client.request({ ':path': '/' }); - - req2.on('response', common.mustNotCall()); - - req2.resume(); - req2.on('end', common.mustCall(() => { - server.close(); - client.destroy(); - })); - - req2.once('error', common.mustCall((err) => { - common.expectsError({ - code: 'ERR_HTTP2_FRAME_ERROR', - type: Error - })(err); - req2.on('error', common.expectsError({ - code: 'ERR_HTTP2_STREAM_ERROR', - type: Error, - message: 'Stream closed with error code 7' - })); - })); - - req2.end(); - })); |