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-create-client-connect.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-create-client-connect.js')
-rw-r--r-- | test/parallel/test-http2-create-client-connect.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test/parallel/test-http2-create-client-connect.js b/test/parallel/test-http2-create-client-connect.js index cd7d8b4fc8..fa9711fe1b 100644 --- a/test/parallel/test-http2-create-client-connect.js +++ b/test/parallel/test-http2-create-client-connect.js @@ -30,7 +30,7 @@ const URL = url.URL; () => setImmediate(() => server.close())); const maybeClose = common.mustCall((client) => { - client.destroy(); + client.close(); serverClose.dec(); }, items.length); @@ -42,7 +42,7 @@ const URL = url.URL; // Will fail because protocol does not match the server. h2.connect({ port: port, protocol: 'https:' }) - .on('socketError', common.mustCall(() => serverClose.dec())); + .on('error', common.mustCall(() => serverClose.dec())); })); } @@ -55,10 +55,8 @@ const URL = url.URL; }; const server = h2.createSecureServer(options); - server.listen(0); - - server.on('listening', common.mustCall(function() { - const port = this.address().port; + server.listen(0, common.mustCall(() => { + const port = server.address().port; const opts = { rejectUnauthorized: false }; @@ -74,7 +72,7 @@ const URL = url.URL; () => setImmediate(() => server.close())); const maybeClose = common.mustCall((client) => { - client.destroy(); + client.close(); serverClose.dec(); }, items.length); |