test: deflake gc-http-client tests by restricting number of requests

nicksia-vgw · ruyadorno · commit 86a7fb0c8adf · 2022-08-22T19:37:19.000-04:00
sequential/test-gc-http-client tests were sometimes failing due to a non-deterministic number of requests being created, causing the test to fail on some systems with a "ECONNRESET" error caused by too many concurrent connections Fixes: #43638 PR-URL: #44146 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: theanarkh <theratliter@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
diff --git a/test/sequential/test-gc-http-client-onerror.js b/test/sequential/test-gc-http-client-onerror.js
@@ -15,6 +15,7 @@ function serverHandler(req, res) {
 }
 
 const http = require('http');
+const numRequests = 36;
 let createClients = true;
 let done = 0;
 let count = 0;
@@ -23,22 +24,26 @@ let countGC = 0;
 const server = http.createServer(serverHandler);
 server.listen(0, common.mustCall(() => {
 for (let i = 0; i < cpus; i++)
- getAll();
+ getAll(numRequests);
 }));
 
-function getAll() {
- if (createClients) {
- const req = http.get({
- hostname: 'localhost',
- pathname: '/',
- port: server.address().port
- }, cb).on('error', onerror);
+function getAll(requestsRemaining) {
+ if (!createClients)
+ return;
 
- count++;
- onGC(req, { ongc });
+ if (requestsRemaining <= 0)
+ return;
 
- setImmediate(getAll);
- }
+ const req = http.get({
+ hostname: 'localhost',
+ pathname: '/',
+ port: server.address().port
+ }, cb).on('error', onerror);
+
+ count++;
+ onGC(req, { ongc });
+
+ setImmediate(getAll, requestsRemaining - 1);
 }
 
 function cb(res) {
diff --git a/test/sequential/test-gc-http-client-timeout.js b/test/sequential/test-gc-http-client-timeout.js
@@ -17,18 +17,22 @@ function serverHandler(req, res) {
 }
 
 const cpus = os.cpus().length;
+const numRequests = 36;
 let createClients = true;
 let done = 0;
 let count = 0;
 let countGC = 0;
 
 const server = http.createServer(serverHandler);
-server.listen(0, common.mustCall(getAll));
+server.listen(0, common.mustCall(() => getAll(numRequests)));
 
-function getAll() {
+function getAll(requestsRemaining) {
 if (!createClients)
 return;
 
+ if (requestsRemaining <= 0)
+ return;
+
 const req = http.get({
 hostname: 'localhost',
 pathname: '/',
@@ -40,11 +44,11 @@ function getAll() {
 count++;
 onGC(req, { ongc });
 
- setImmediate(getAll);
+ setImmediate(getAll, requestsRemaining - 1);
 }
 
 for (let i = 0; i < cpus; i++)
- getAll();
+ getAll(numRequests);
 
 function cb(res) {
 res.resume();
diff --git a/test/sequential/test-gc-http-client.js b/test/sequential/test-gc-http-client.js
@@ -13,6 +13,7 @@ function serverHandler(req, res) {
 }
 
 const http = require('http');
+const numRequests = 36;
 let createClients = true;
 let done = 0;
 let count = 0;
@@ -21,13 +22,16 @@ let countGC = 0;
 const server = http.createServer(serverHandler);
 server.listen(0, common.mustCall(() => {
 for (let i = 0; i < cpus; i++)
- getAll();
+ getAll(numRequests);
 }));
 
-function getAll() {
+function getAll(requestsRemaining) {
 if (!createClients)
 return;
 
+ if (requestsRemaining <= 0)
+ return;
+
 const req = http.get({
 hostname: 'localhost',
 pathname: '/',
@@ -37,7 +41,7 @@ function getAll() {
 count++;
 onGC(req, { ongc });
 
- setImmediate(getAll);
+ setImmediate(getAll, requestsRemaining - 1);
 }
 
 function cb(res) {

-Original file line number
+Diff line change
+}
 consthttp=require('http');
 +constnumRequests=36;
 letcreateClients=true;
 letdone=0;
 letcount=0;
 constserver=http.createServer(serverHandler);
 server.listen(0,common.mustCall(()=>{
 for(leti=0;i<cpus;i++)
 -getAll();
 +getAll(numRequests);
 }));
 -functiongetAll(){
 -if(createClients){
 -constreq=http.get({
 -hostname: 'localhost',
 -pathname: '/',
 -port: server.address().port
 -},cb).on('error',onerror);
 +functiongetAll(requestsRemaining){
 +if(!createClients)
 +return;
 -count++;
 -onGC(req,{ ongc });
 +if(requestsRemaining<=0)
 +return;
 -setImmediate(getAll);
 -}
 +constreq=http.get({
 +hostname: 'localhost',
 +pathname: '/',
 +port: server.address().port
 +},cb).on('error',onerror);
++
 +count++;
 +onGC(req,{ ongc });
++
 +setImmediate(getAll,requestsRemaining-1);
+}
 functioncb(res){