summaryrefslogtreecommitdiff
path: root/test/parallel/test-cluster-send-deadlock.js
diff options
context:
space:
mode:
authorLuigi Pinca <luigipinca@gmail.com>2018-03-09 11:05:38 +0100
committerLuigi Pinca <luigipinca@gmail.com>2018-03-21 18:24:10 +0100
commit74553465e6c450a3777c27f9cd3bd209a3726eda (patch)
treecaa3408d145b3290d4c6a72e6b0c8faa144bee7a /test/parallel/test-cluster-send-deadlock.js
parent0ac4ef9a4c5672b573768050259b0fe537778a1e (diff)
downloadandroid-node-v8-74553465e6c450a3777c27f9cd3bd209a3726eda.tar.gz
android-node-v8-74553465e6c450a3777c27f9cd3bd209a3726eda.tar.bz2
android-node-v8-74553465e6c450a3777c27f9cd3bd209a3726eda.zip
test: refactor test-cluster-send-deadlock
Wait for the sockets to be connected before closing them and remove unneeded `setTimeout()`. PR-URL: https://github.com/nodejs/node/pull/19241 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Diffstat (limited to 'test/parallel/test-cluster-send-deadlock.js')
-rw-r--r--test/parallel/test-cluster-send-deadlock.js22
1 files changed, 14 insertions, 8 deletions
diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js
index 668ef517e0..b02837e7fb 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);
}