http2: add checks for server close callback

Verify that server close callbacks are being called Backport-PR-URL: #20456 PR-URL: #18182 Refs: #18176 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
nodejs · May 2, 2018 · ac64b4f · ac64b4f
1 parent 8b0a1b3
commit ac64b4f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/test/parallel/test-http2-create-client-secure-session.js b/test/parallel/test-http2-create-client-secure-session.js
@@ -38,6 +38,7 @@ function onStream(stream, headers) {
 function verifySecureSession(key, cert, ca, opts) {
   const server = h2.createSecureServer({ cert, key });
   server.on('stream', common.mustCall(onStream));
+  server.on('close', common.mustCall());
   server.listen(0, common.mustCall(() => {
     opts = opts || { };
     opts.secureContext = tls.createSecureContext({ ca });
@@ -72,7 +73,7 @@ function verifySecureSession(key, cert, ca, opts) {
       assert.strictEqual(jsonData.servername,
                          opts.servername || 'localhost');
       assert.strictEqual(jsonData.alpnProtocol, 'h2');
-      server.close();
+      server.close(common.mustCall());
       client[kSocket].destroy();
     }));
   }));

diff --git a/test/parallel/test-http2-create-client-session.js b/test/parallel/test-http2-create-client-session.js
@@ -29,6 +29,8 @@ function onStream(stream, headers, flags) {
   stream.end(body.slice(20));
 }
 
+server.on('close', common.mustCall());
+
 server.listen(0);
 
 server.on('listening', common.mustCall(() => {
@@ -46,7 +48,7 @@ server.on('listening', common.mustCall(() => {
 
   const countdown = new Countdown(count, () => {
     client.close();
-    server.close();
+    server.close(common.mustCall());
   });
 
   for (let n = 0; n < count; n++) {

diff --git a/test/parallel/test-http2-createwritereq.js b/test/parallel/test-http2-createwritereq.js
@@ -60,7 +60,7 @@ server.listen(0, common.mustCall(function() {
       testsFinished++;
 
       if (testsFinished === testsToRun) {
-        server.close();
+        server.close(common.mustCall());
       }
     }));
 

diff --git a/test/parallel/test-http2-misbehaving-flow-control.js b/test/parallel/test-http2-misbehaving-flow-control.js
@@ -72,14 +72,16 @@ server.on('stream', (stream) => {
     message: 'Stream closed with error code 3'
   }));
   stream.on('close', common.mustCall(() => {
-    server.close();
+    server.close(common.mustCall());
     client.destroy();
   }));
   stream.resume();
   stream.respond();
   stream.end('ok');
 });
 
+server.on('close', common.mustCall());
+
 server.listen(0, () => {
   client = net.connect(server.address().port, () => {
     client.write(preamble);