test: fix flaky test-http2-server-rst-stream.js

PR-URL: #16690Fixes: #16688 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Matteo Collina <[email protected]>

Author: apapirovski

test/parallel/test-http2-server-rst-stream.js

@@ -5,75 +5,52 @@ if (!common.hasCrypto)
 common.skip('missing crypto');
 constassert=require('assert');
 consthttp2=require('http2');
+constCountdown=require('../common/countdown');
 
 const{
-HTTP2_HEADER_METHOD,
-HTTP2_HEADER_PATH,
-HTTP2_METHOD_POST,
 NGHTTP2_CANCEL,
 NGHTTP2_NO_ERROR,
 NGHTTP2_PROTOCOL_ERROR,
 NGHTTP2_REFUSED_STREAM,
 NGHTTP2_INTERNAL_ERROR
 }=http2.constants;
 
-consterrCheck=common.expectsError({code: 'ERR_HTTP2_STREAM_ERROR'},6);
+consttests=[
+['rstStream',NGHTTP2_NO_ERROR,false],
+['rstWithNoError',NGHTTP2_NO_ERROR,false],
+['rstWithProtocolError',NGHTTP2_PROTOCOL_ERROR,true],
+['rstWithCancel',NGHTTP2_CANCEL,false],
+['rstWithRefuse',NGHTTP2_REFUSED_STREAM,true],
+['rstWithInternalError',NGHTTP2_INTERNAL_ERROR,true]
+];
+
+constserver=http2.createServer();
+server.on('stream',(stream,headers)=>{
+constmethod=headers['rstmethod'];
+stream[method]();
+});
+
+server.listen(0,common.mustCall(()=>{
+constclient=http2.connect(`http://localhost:${server.address().port}`);
+
+constcountdown=newCountdown(tests.length,common.mustCall(()=>{
+client.destroy();
+server.close();
+}));
 
-functioncheckRstCode(rstMethod,expectRstCode){
-constserver=http2.createServer();
-server.on('stream',(stream,headers,flags)=>{
-stream.respond({
-'content-type': 'text/html',
-':status': 200
+tests.forEach((test)=>{
+constreq=client.request({
+':method': 'POST',
+rstmethod: test[0]
 });
-stream.write('test');
-if(rstMethod==='rstStream')
-stream[rstMethod](expectRstCode);
-else
-stream[rstMethod]();
-
-if(expectRstCode!==NGHTTP2_NO_ERROR&&
-expectRstCode!==NGHTTP2_CANCEL){
-stream.on('error',common.mustCall(errCheck));
-}else{
-stream.on('error',common.mustNotCall());
-}
-});
-
-server.listen(0,common.mustCall(()=>{
-constport=server.address().port;
-constclient=http2.connect(`http://localhost:${port}`);
-
-constheaders={
-[HTTP2_HEADER_PATH]: '/',
-[HTTP2_HEADER_METHOD]: HTTP2_METHOD_POST
-};
-constreq=client.request(headers);
-
-req.setEncoding('utf8');
-req.on('streamClosed',common.mustCall((actualRstCode)=>{
-assert.strictEqual(
-expectRstCode,actualRstCode,`${rstMethod} is not match rstCode`);
-server.close();
-client.destroy();
+req.on('streamClosed',common.mustCall((code)=>{
+assert.strictEqual(code,test[1]);
+countdown.dec();
 }));
-req.on('data',common.mustCall());
 req.on('aborted',common.mustCall());
-req.on('end',common.mustCall());
-
-if(expectRstCode!==NGHTTP2_NO_ERROR&&
-expectRstCode!==NGHTTP2_CANCEL){
-req.on('error',common.mustCall(errCheck));
-}else{
+if(test[2])
+req.on('error',common.mustCall());
+else
 req.on('error',common.mustNotCall());
-}
-
-}));
-}
-
-checkRstCode('rstStream',NGHTTP2_NO_ERROR);
-checkRstCode('rstWithNoError',NGHTTP2_NO_ERROR);
-checkRstCode('rstWithProtocolError',NGHTTP2_PROTOCOL_ERROR);
-checkRstCode('rstWithCancel',NGHTTP2_CANCEL);
-checkRstCode('rstWithRefuse',NGHTTP2_REFUSED_STREAM);
-checkRstCode('rstWithInternalError',NGHTTP2_INTERNAL_ERROR);
+});
+}));