Skip to content

Commit ac64b4f

Browse files
jasnellMylesBorins
authored andcommitted
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>
1 parent 8b0a1b3 commit ac64b4f

4 files changed

+9
-4
lines changed

test/parallel/test-http2-create-client-secure-session.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ function onStream(stream, headers) {
3838
function verifySecureSession(key, cert, ca, opts) {
3939
const server = h2.createSecureServer({ cert, key });
4040
server.on('stream', common.mustCall(onStream));
41+
server.on('close', common.mustCall());
4142
server.listen(0, common.mustCall(() => {
4243
opts = opts || { };
4344
opts.secureContext = tls.createSecureContext({ ca });
@@ -72,7 +73,7 @@ function verifySecureSession(key, cert, ca, opts) {
7273
assert.strictEqual(jsonData.servername,
7374
opts.servername || 'localhost');
7475
assert.strictEqual(jsonData.alpnProtocol, 'h2');
75-
server.close();
76+
server.close(common.mustCall());
7677
client[kSocket].destroy();
7778
}));
7879
}));

test/parallel/test-http2-create-client-session.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ function onStream(stream, headers, flags) {
2929
stream.end(body.slice(20));
3030
}
3131

32+
server.on('close', common.mustCall());
33+
3234
server.listen(0);
3335

3436
server.on('listening', common.mustCall(() => {
@@ -46,7 +48,7 @@ server.on('listening', common.mustCall(() => {
4648

4749
const countdown = new Countdown(count, () => {
4850
client.close();
49-
server.close();
51+
server.close(common.mustCall());
5052
});
5153

5254
for (let n = 0; n < count; n++) {

test/parallel/test-http2-createwritereq.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ server.listen(0, common.mustCall(function() {
6060
testsFinished++;
6161

6262
if (testsFinished === testsToRun) {
63-
server.close();
63+
server.close(common.mustCall());
6464
}
6565
}));
6666

test/parallel/test-http2-misbehaving-flow-control.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,16 @@ server.on('stream', (stream) => {
7272
message: 'Stream closed with error code 3'
7373
}));
7474
stream.on('close', common.mustCall(() => {
75-
server.close();
75+
server.close(common.mustCall());
7676
client.destroy();
7777
}));
7878
stream.resume();
7979
stream.respond();
8080
stream.end('ok');
8181
});
8282

83+
server.on('close', common.mustCall());
84+
8385
server.listen(0, () => {
8486
client = net.connect(server.address().port, () => {
8587
client.write(preamble);

0 commit comments

Comments
 (0)