From 83ddd3e7d0d18436405497d82e4b2daa983d0f3b Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Sun, 21 Oct 2018 16:36:08 -0400
Subject: [PATCH] test: fix flaky test

This commit fixes test-tls-set-secure-context.js. The test was
making one long lasting HTTP connection, followed by a number of
shorter lived connections. However, it was possible that the
connections were not received in the desired order. This commit
ensures that the long lasting connection is established before
making any other connections.

PR-URL: https://github.com/nodejs/node/pull/23811
Fixes: https://github.com/nodejs/node/issues/23807
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 test/parallel/test-tls-set-secure-context.js | 59 ++++++++++++--------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/test/parallel/test-tls-set-secure-context.js b/test/parallel/test-tls-set-secure-context.js
index 51ab3af10b540e..f8857701c68b3c 100644
--- a/test/parallel/test-tls-set-secure-context.js
+++ b/test/parallel/test-tls-set-secure-context.js
@@ -4,6 +4,10 @@ const common = require('../common');
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
+// This test verifies the behavior of the tls setSecureContext() method.
+// It also verifies that existing connections are not disrupted when the
+// secure context is changed.
+
 const assert = require('assert');
 const https = require('https');
 const fixtures = require('../common/fixtures');
@@ -19,54 +23,63 @@ const credentialOptions = [
     ca: fixtures.readKey('ca2-cert.pem')
   }
 ];
-let requestsCount = 0;
 let firstResponse;
 
 const server = https.createServer(credentialOptions[0], (req, res) => {
-  requestsCount++;
+  const id = +req.headers.id;
 
-  if (requestsCount === 1) {
+  if (id === 1) {
     firstResponse = res;
     firstResponse.write('multi-');
     return;
-  } else if (requestsCount === 3) {
+  } else if (id === 4) {
     firstResponse.write('success-');
   }
 
   res.end('success');
 });
 
-server.listen(0, common.mustCall(async () => {
+server.listen(0, common.mustCall(() => {
   const { port } = server.address();
-  const firstRequest = makeRequest(port);
+  const firstRequest = makeRequest(port, 1);
+
+  async function makeRemainingRequests() {
+    // Wait until the first request is guaranteed to have been handled.
+    if (!firstResponse) {
+      return setImmediate(makeRemainingRequests);
+    }
 
-  assert.strictEqual(await makeRequest(port), 'success');
+    assert.strictEqual(await makeRequest(port, 2), 'success');
 
-  server.setSecureContext(credentialOptions[1]);
-  firstResponse.write('request-');
-  await assert.rejects(async () => {
-    await makeRequest(port);
-  }, /^Error: self signed certificate$/);
+    server.setSecureContext(credentialOptions[1]);
+    firstResponse.write('request-');
+    await assert.rejects(async () => {
+      await makeRequest(port, 3);
+    }, /^Error: self signed certificate$/);
 
-  server.setSecureContext(credentialOptions[0]);
-  assert.strictEqual(await makeRequest(port), 'success');
+    server.setSecureContext(credentialOptions[0]);
+    assert.strictEqual(await makeRequest(port, 4), 'success');
 
-  server.setSecureContext(credentialOptions[1]);
-  firstResponse.end('fun!');
-  await assert.rejects(async () => {
-    await makeRequest(port);
-  }, /^Error: self signed certificate$/);
+    server.setSecureContext(credentialOptions[1]);
+    firstResponse.end('fun!');
+    await assert.rejects(async () => {
+      await makeRequest(port, 5);
+    }, /^Error: self signed certificate$/);
+
+    assert.strictEqual(await firstRequest, 'multi-request-success-fun!');
+    server.close();
+  }
 
-  assert.strictEqual(await firstRequest, 'multi-request-success-fun!');
-  server.close();
+  makeRemainingRequests();
 }));
 
-function makeRequest(port) {
+function makeRequest(port, id) {
   return new Promise((resolve, reject) => {
     const options = {
       rejectUnauthorized: true,
       ca: credentialOptions[0].ca,
-      servername: 'agent1'
+      servername: 'agent1',
+      headers: { id }
     };
 
     https.get(`https://localhost:${port}`, options, (res) => {