summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-01-07 16:30:31 -0800
committerSam Roberts <vieuxtech@gmail.com>2019-02-06 15:17:53 -0800
commit426a87025ba093c292026760ec548e9a68c0fb1c (patch)
tree77f751897fb87b87d8e5f665ad749eeb40a96a69 /test
parent8bc39e7286526dfc1b7edf5861f9c4c6f6146721 (diff)
downloadandroid-node-v8-426a87025ba093c292026760ec548e9a68c0fb1c.tar.gz
android-node-v8-426a87025ba093c292026760ec548e9a68c0fb1c.tar.bz2
android-node-v8-426a87025ba093c292026760ec548e9a68c0fb1c.zip
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>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-tls-alpn-server-client.js17
1 files 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 2540831a38..76604e0587 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);
+ });
}
});
}