diff options
author | Sebastian Plesciuc <sebastian.plesciuc@sendgrid.com> | 2017-04-17 20:45:13 +0300 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-04-19 10:09:13 -0700 |
commit | 9c5c4697b57c6455b313b9c3a58d8691ba070c1d (patch) | |
tree | ebfaed1bc92a6b7845f50b2db67ecf742138a428 /test/parallel/test-cluster-send-deadlock.js | |
parent | d78fd265ddae6cc2fd1b43a22b6d933ffa95c83b (diff) | |
download | android-node-v8-9c5c4697b57c6455b313b9c3a58d8691ba070c1d.tar.gz android-node-v8-9c5c4697b57c6455b313b9c3a58d8691ba070c1d.tar.bz2 android-node-v8-9c5c4697b57c6455b313b9c3a58d8691ba070c1d.zip |
test: dynamic port in cluster worker send
Remove common.PORT from test-cluster-send-deadlock and
test-cluster-send-handle-twice to reduce possibility that
a dynamic port used in another test will collide with common.PORT.
PR-URL: https://github.com/nodejs/node/pull/12472
Ref: https://github.com/nodejs/node/issues/12376
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Diffstat (limited to 'test/parallel/test-cluster-send-deadlock.js')
-rw-r--r-- | test/parallel/test-cluster-send-deadlock.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js index bd6b6c9033..9ae0f4a119 100644 --- a/test/parallel/test-cluster-send-deadlock.js +++ b/test/parallel/test-cluster-send-deadlock.js @@ -23,7 +23,7 @@ // Testing mutual send of handles: from master to worker, and from worker to // master. -const common = require('../common'); +require('../common'); const assert = require('assert'); const cluster = require('cluster'); const net = require('net'); @@ -40,14 +40,15 @@ if (cluster.isMaster) { worker.send('handle', socket); }); - server.listen(common.PORT, function() { - worker.send('listen'); + server.listen(0, function() { + worker.send({message: 'listen', port: server.address().port}); }); } else { process.on('message', function(msg, handle) { - if (msg === 'listen') { - const client1 = net.connect({ host: 'localhost', port: common.PORT }); - const client2 = net.connect({ host: 'localhost', port: common.PORT }); + 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 }); let waiting = 2; client1.on('close', onclose); client2.on('close', onclose); |