From 747d9ae72e8874d6fb6574f040f28f67280489c0 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Thu, 12 Sep 2024 17:48:13 +0200 Subject: [PATCH] test: deflake test-http2-misbehaving-multiplex Fixes: https://github.com/nodejs/node/issues/54859 PR-URL: https://github.com/nodejs/node/pull/54872 Reviewed-By: James M Snell Reviewed-By: Jake Yuesong Li Reviewed-By: Richard Lau --- .../test-http2-misbehaving-multiplex.js | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/test/parallel/test-http2-misbehaving-multiplex.js b/test/parallel/test-http2-misbehaving-multiplex.js index 5ffaba1ef9ff12..c605f1050dc29a 100644 --- a/test/parallel/test-http2-misbehaving-multiplex.js +++ b/test/parallel/test-http2-misbehaving-multiplex.js @@ -11,18 +11,30 @@ const h2 = require('http2'); const net = require('net'); const { NghttpError } = require('internal/http2/util'); const h2test = require('../common/http2'); +let client; const server = h2.createServer(); server.on('stream', common.mustCall((stream) => { stream.respond(); - stream.end('ok'); - stream.on('error', common.expectsError({ - code: 'ERR_HTTP2_ERROR', - constructor: NghttpError, - message: 'Stream was already closed or invalid' - })); - stream.on('close', common.mustCall()); + if (stream.id === 3) { + stream.on('close', () => { + // A second Stream ID 1 frame should fail. + // This will cause an error to occur because the client is + // attempting to reuse an already closed stream. This must + // cause the server session to be torn down. + client.write(id1.data); + // This Stream ID 5 frame will never make it to the server. + client.write(id5.data); + }); + stream.end('ok'); + } else { + stream.on('error', common.expectsError({ + code: 'ERR_HTTP2_ERROR', + constructor: NghttpError, + message: 'Stream was already closed or invalid' + })); + } // Stream ID 5 should never reach the server assert.notStrictEqual(stream.id, 5); @@ -45,23 +57,14 @@ const id3 = new h2test.HeadersFrame(3, h2test.kFakeRequestHeaders, 0, true); const id5 = new h2test.HeadersFrame(5, h2test.kFakeRequestHeaders, 0, true); server.listen(0, () => { - const client = net.connect(server.address().port, () => { + client = net.connect(server.address().port, () => { client.write(h2test.kClientMagic, () => { client.write(settings.data, () => { client.write(settingsAck.data); // Stream ID 1 frame will make it OK. client.write(id1.data, () => { // Stream ID 3 frame will make it OK. - client.write(id3.data, () => { - // A second Stream ID 1 frame should fail. - // This will cause an error to occur because the client is - // attempting to reuse an already closed stream. This must - // cause the server session to be torn down. - client.write(id1.data, () => { - // This Stream ID 5 frame will never make it to the server - client.write(id5.data); - }); - }); + client.write(id3.data); }); }); });