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-multi-content-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-multi-content-length.js')
-rw-r--r-- | test/parallel/test-http2-multi-content-length.js | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/test/parallel/test-http2-multi-content-length.js b/test/parallel/test-http2-multi-content-length.js index d0f0094d24..4d18356f12 100644 --- a/test/parallel/test-http2-multi-content-length.js +++ b/test/parallel/test-http2-multi-content-length.js @@ -4,6 +4,7 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); +const Countdown = require('../common/countdown'); const server = http2.createServer(); @@ -15,29 +16,25 @@ server.on('stream', common.mustCall((stream) => { server.listen(0, common.mustCall(() => { const client = http2.connect(`http://localhost:${server.address().port}`); - let remaining = 3; - function maybeClose() { - if (--remaining === 0) { - server.close(); - client.destroy(); - } - } + const countdown = new Countdown(2, () => { + server.close(); + client.close(); + }); - { - // Request 1 will fail because there are two content-length header values - const req = client.request({ - ':method': 'POST', - 'content-length': 1, - 'Content-Length': 2 - }); - req.on('error', common.expectsError({ + // Request 1 will fail because there are two content-length header values + common.expectsError( + () => { + client.request({ + ':method': 'POST', + 'content-length': 1, + 'Content-Length': 2 + }); + }, { code: 'ERR_HTTP2_HEADER_SINGLE_VALUE', type: Error, message: 'Header field "content-length" must have only a single value' - })); - req.on('error', common.mustCall(maybeClose)); - req.end('a'); - } + } + ); { // Request 2 will succeed @@ -46,7 +43,8 @@ server.listen(0, common.mustCall(() => { 'content-length': 1 }); req.resume(); - req.on('end', common.mustCall(maybeClose)); + req.on('end', common.mustCall()); + req.on('close', common.mustCall(() => countdown.dec())); req.end('a'); } @@ -55,7 +53,8 @@ server.listen(0, common.mustCall(() => { // header to be set for non-payload bearing requests... const req = client.request({ 'content-length': 1 }); req.resume(); - req.on('end', common.mustCall(maybeClose)); + req.on('end', common.mustCall()); + req.on('close', common.mustCall(() => countdown.dec())); req.on('error', common.expectsError({ code: 'ERR_HTTP2_STREAM_ERROR', type: Error, |