From 639dc07ca066f938d372f8df5996df9f0095d393 Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Mon, 7 Jan 2019 16:30:31 -0800
Subject: [PATCH] test: do not assume tls handshake order

Do not assume that server handshake event happens before client, it is
not guaranteed.

PR-URL: https://github.com/nodejs/node/pull/25508
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-tls-alpn-server-client.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js
index 2540831a38f25c..76604e05875c65 100644
--- a/test/parallel/test-tls-alpn-server-client.js
+++ b/test/parallel/test-tls-alpn-server-client.js
@@ -23,9 +23,10 @@ function runTest(clientsOptions, serverOptions, cb) {
   serverOptions.key = loadPEM('agent2-key');
   serverOptions.cert = loadPEM('agent2-cert');
   const results = [];
-  let index = 0;
+  let clientIndex = 0;
+  let serverIndex = 0;
   const server = tls.createServer(serverOptions, function(c) {
-    results[index].server = { ALPN: c.alpnProtocol };
+    results[serverIndex++].server = { ALPN: c.alpnProtocol };
   });
 
   server.listen(0, serverIP, function() {
@@ -38,16 +39,18 @@ function runTest(clientsOptions, serverOptions, cb) {
     opt.host = serverIP;
     opt.rejectUnauthorized = false;
 
-    results[index] = {};
+    results[clientIndex] = {};
     const client = tls.connect(opt, function() {
-      results[index].client = { ALPN: client.alpnProtocol };
-      client.destroy();
+      results[clientIndex].client = { ALPN: client.alpnProtocol };
+      client.end();
       if (options.length) {
-        index++;
+        clientIndex++;
         connectClient(options);
       } else {
         server.close();
-        cb(results);
+        server.on('close', () => {
+          cb(results);
+        });
       }
     });
   }