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: #12472 Ref: #12376 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]>
nodejs · May 2, 2017 · f48d06c · f48d06c
1 parent a75fbe0
commit f48d06c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/test/parallel/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js
@@ -2,7 +2,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');
@@ -19,14 +19,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);

diff --git a/test/parallel/test-cluster-send-handle-twice.js b/test/parallel/test-cluster-send-handle-twice.js
@@ -24,8 +24,11 @@ if (cluster.isMaster) {
     process.send('send-handle-2', socket);
   });
 
-  server.listen(common.PORT, function() {
-    const client = net.connect({ host: 'localhost', port: common.PORT });
+  server.listen(0, function() {
+    const client = net.connect({
+      host: 'localhost',
+      port: server.address().port
+    });
     client.on('close', common.mustCall(() => { cluster.worker.disconnect(); }));
     setTimeout(function() { client.end(); }, 50);
   }).on('error', function(e) {