test: fix flaky timeout-delayed-body and headers tests

Linkgoron · Trott · commit d75543d8b5ab · 2021-04-05T07:49:01.000-07:00
fix the flaky test-http-server-request-timeout-delayed-body and test-http-server-request-timeout-delayed-headers which sometimes fail on slow systems. PR-URL: #38045 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/test/parallel/test-http-server-request-timeout-delayed-body.js b/test/parallel/test-http-server-request-timeout-delayed-body.js
@@ -9,6 +9,7 @@ const { connect } = require('net');
 // after server.requestTimeout if the client
 // pauses before start sending the body.
 
+let sendDelayedRequestBody;
 const server = createServer(common.mustCall((req, res) => {
   let body = '';
   req.setEncoding('utf-8');
@@ -22,6 +23,9 @@ const server = createServer(common.mustCall((req, res) => {
     res.write(body);
     res.end();
   });
+
+  assert.strictEqual(typeof sendDelayedRequestBody, 'function');
+  sendDelayedRequestBody();
 }));
 
 // 0 seconds is the default
@@ -44,9 +48,11 @@ server.listen(0, common.mustCall(() => {
   client.write('Connection: close\r\n');
   client.write('\r\n');
 
-  setTimeout(() => {
-    client.write('12345678901234567890\r\n\r\n');
-  }, common.platformTimeout(2000)).unref();
+  sendDelayedRequestBody = common.mustCall(() => {
+    setTimeout(() => {
+      client.write('12345678901234567890\r\n\r\n');
+    }, common.platformTimeout(2000)).unref();
+  });
 
   const errOrEnd = common.mustCall(function(err) {
     console.log(err);
diff --git a/test/parallel/test-http-server-request-timeout-delayed-headers.js b/test/parallel/test-http-server-request-timeout-delayed-headers.js
@@ -8,9 +8,12 @@ const { connect } = require('net');
 // This test validates that the server returns 408
 // after server.requestTimeout if the client
 // pauses before start sending the request.
-
+let sendDelayedRequestHeaders;
 const server = createServer(common.mustNotCall());
-
+server.on('connection', common.mustCall(() => {
+  assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');
+  sendDelayedRequestHeaders();
+}));
 // 0 seconds is the default
 assert.strictEqual(server.requestTimeout, 0);
 const requestTimeout = common.platformTimeout(1000);
@@ -39,10 +42,12 @@ server.listen(0, common.mustCall(() => {
 
   client.resume();
 
-  setTimeout(() => {
-    client.write('POST / HTTP/1.1\r\n');
-    client.write('Content-Length: 20\r\n');
-    client.write('Connection: close\r\n\r\n');
-    client.write('12345678901234567890\r\n\r\n');
-  }, common.platformTimeout(2000)).unref();
+  sendDelayedRequestHeaders = common.mustCall(() => {
+    setTimeout(() => {
+      client.write('POST / HTTP/1.1\r\n');
+      client.write('Content-Length: 20\r\n');
+      client.write('Connection: close\r\n\r\n');
+      client.write('12345678901234567890\r\n\r\n');
+    }, common.platformTimeout(2000)).unref();
+  });
 }));
diff --git a/test/parallel/test-http-server-request-timeout-interrupted-body.js b/test/parallel/test-http-server-request-timeout-interrupted-body.js
@@ -8,7 +8,7 @@ const { connect } = require('net');
 // This test validates that the server returns 408
 // after server.requestTimeout if the client
 // pauses sending in the middle of the body.
-
+let sendDelayedRequestBody;
 const server = createServer(common.mustCall((req, res) => {
   let body = '';
   req.setEncoding('utf-8');
@@ -22,6 +22,9 @@ const server = createServer(common.mustCall((req, res) => {
     res.write(body);
     res.end();
   });
+
+  assert.strictEqual(typeof sendDelayedRequestBody, 'function');
+  sendDelayedRequestBody();
 }));
 
 // 0 seconds is the default
@@ -57,7 +60,9 @@ server.listen(0, common.mustCall(() => {
   client.write('\r\n');
   client.write('1234567890');
 
-  setTimeout(() => {
-    client.write('1234567890\r\n\r\n');
-  }, common.platformTimeout(2000)).unref();
+  sendDelayedRequestBody = common.mustCall(() => {
+    setTimeout(() => {
+      client.write('1234567890\r\n\r\n');
+    }, common.platformTimeout(2000)).unref();
+  });
 }));
diff --git a/test/parallel/test-http-server-request-timeout-interrupted-headers.js b/test/parallel/test-http-server-request-timeout-interrupted-headers.js
@@ -8,8 +8,12 @@ const { connect } = require('net');
 // This test validates that the server returns 408
 // after server.requestTimeout if the client
 // pauses sending in the middle of a header.
-
+let sendDelayedRequestHeaders;
 const server = createServer(common.mustNotCall());
+server.on('connection', common.mustCall(() => {
+  assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');
+  sendDelayedRequestHeaders();
+}));
 
 // 120 seconds is the default
 assert.strictEqual(server.requestTimeout, 0);
@@ -42,7 +46,9 @@ server.listen(0, common.mustCall(() => {
   client.write('Connection: close\r\n');
   client.write('X-CRASH: ');
 
-  setTimeout(() => {
-    client.write('1234567890\r\n\r\n');
-  }, common.platformTimeout(2000)).unref();
+  sendDelayedRequestHeaders = common.mustCall(() => {
+    setTimeout(() => {
+      client.write('1234567890\r\n\r\n');
+    }, common.platformTimeout(2000)).unref();
+  });
 }));
diff --git a/test/parallel/test-http-server-request-timeout-upgrade.js b/test/parallel/test-http-server-request-timeout-upgrade.js
@@ -7,8 +7,12 @@ const { connect } = require('net');
 
 // This test validates that the requestTimeoout
 // is disabled after the connection is upgraded.
-
+let sendDelayedRequestHeaders;
 const server = createServer(common.mustNotCall());
+server.on('connection', common.mustCall(() => {
+  assert.strictEqual(typeof sendDelayedRequestHeaders, 'function');
+  sendDelayedRequestHeaders();
+}));
 
 // 0 seconds is the default
 assert.strictEqual(server.requestTimeout, 0);
@@ -48,8 +52,10 @@ server.listen(0, common.mustCall(() => {
   client.write('Upgrade: WebSocket\r\n');
   client.write('Connection: Upgrade\r\n\r\n');
 
-  setTimeout(() => {
-    client.write('12345678901234567890');
-    client.end();
-  }, common.platformTimeout(2000)).unref();
+  sendDelayedRequestHeaders = common.mustCall(() => {
+    setTimeout(() => {
+      client.write('12345678901234567890');
+      client.end();
+    }, common.platformTimeout(2000)).unref();
+  });
 }));
