From 5b957e1cc57685dbda09c17207802ce9d520994f Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Fri, 9 Mar 2018 11:05:38 +0100 Subject: [PATCH] test: refactor test-cluster-send-deadlock Wait for the sockets to be connected before closing them and remove unneeded `setTimeout()`. --- test/parallel/test-cluster-send-deadlock.js | 22 +++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js index 668ef517e0a27f..b02837e7fb1793 100644 --- a/test/parallel/test-cluster-send-deadlock.js +++ b/test/parallel/test-cluster-send-deadlock.js @@ -47,19 +47,25 @@ if (cluster.isMaster) { process.on('message', function(msg, handle) { if (msg.message && msg.message === 'listen') { assert(msg.port); - const client1 = net.connect({ host: 'localhost', port: msg.port }); - const client2 = net.connect({ host: 'localhost', port: msg.port }); + const client1 = net.connect({ + host: 'localhost', + port: msg.port + }, function() { + const client2 = net.connect({ + host: 'localhost', + port: msg.port + }, function() { + client1.on('close', onclose); + client2.on('close', onclose); + client1.end(); + client2.end(); + }); + }); let waiting = 2; - client1.on('close', onclose); - client2.on('close', onclose); function onclose() { if (--waiting === 0) cluster.worker.disconnect(); } - setTimeout(function() { - client1.end(); - client2.end(); - }, 50); } else { process.send('reply', handle); }