From f2467edc624289b402932f181259336892e924f0 Mon Sep 17 00:00:00 2001 From: Tarun Batra Date: Mon, 17 Apr 2017 02:21:48 +0530 Subject: [PATCH] test: remove common.PORT from multiple tests PR-URL: https://github.com/nodejs/node/pull/12451 Ref: https://github.com/nodejs/node/issues/12376 Reviewed-By: Santiago Gimeno Reviewed-By: Luigi Pinca Reviewed-By: Benjamin Gruenbaum Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- test/parallel/test-cluster-master-error.js | 2 +- test/parallel/test-cluster-master-kill.js | 2 +- test/parallel/test-cluster-net-send.js | 4 ++-- test/parallel/test-cluster-rr-domain-listen.js | 4 ++-- test/parallel/test-cluster-rr-ref.js | 2 +- test/parallel/test-cluster-shared-leak.js | 8 +++----- test/parallel/test-cluster-worker-no-exit.js | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/test/parallel/test-cluster-master-error.js b/test/parallel/test-cluster-master-error.js index 11ed09c64ed04e..c69c867bf08033 100644 --- a/test/parallel/test-cluster-master-error.js +++ b/test/parallel/test-cluster-master-error.js @@ -10,7 +10,7 @@ if (cluster.isWorker) { const http = require('http'); http.Server(() => { - }).listen(common.PORT, '127.0.0.1'); + }).listen(0, '127.0.0.1'); } else if (process.argv[2] === 'cluster') { diff --git a/test/parallel/test-cluster-master-kill.js b/test/parallel/test-cluster-master-kill.js index 094e5ad256de7d..ba5414c11e1d48 100644 --- a/test/parallel/test-cluster-master-kill.js +++ b/test/parallel/test-cluster-master-kill.js @@ -7,7 +7,7 @@ if (cluster.isWorker) { // keep the worker alive const http = require('http'); - http.Server().listen(common.PORT, '127.0.0.1'); + http.Server().listen(0, '127.0.0.1'); } else if (process.argv[2] === 'cluster') { diff --git a/test/parallel/test-cluster-net-send.js b/test/parallel/test-cluster-net-send.js index d375920e91b18b..73442bd4594a9f 100644 --- a/test/parallel/test-cluster-net-send.js +++ b/test/parallel/test-cluster-net-send.js @@ -46,8 +46,8 @@ if (process.argv[2] !== 'child') { socketConnected(); }); - server.listen(common.PORT, function() { - socket = net.connect(common.PORT, '127.0.0.1', socketConnected); + server.listen(0, function() { + socket = net.connect(server.address().port, '127.0.0.1', socketConnected); }); process.on('disconnect', function() { diff --git a/test/parallel/test-cluster-rr-domain-listen.js b/test/parallel/test-cluster-rr-domain-listen.js index ee507cd47b2a23..44d6aea560d3c8 100644 --- a/test/parallel/test-cluster-rr-domain-listen.js +++ b/test/parallel/test-cluster-rr-domain-listen.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +require('../common'); const cluster = require('cluster'); const domain = require('domain'); @@ -11,7 +11,7 @@ if (cluster.isWorker) { d.run(function() { }); const http = require('http'); - http.Server(function() { }).listen(common.PORT, '127.0.0.1'); + http.Server(function() { }).listen(0, '127.0.0.1'); } else if (cluster.isMaster) { let worker; diff --git a/test/parallel/test-cluster-rr-ref.js b/test/parallel/test-cluster-rr-ref.js index 19420fed83f9f1..cf5e4f346bf7e2 100644 --- a/test/parallel/test-cluster-rr-ref.js +++ b/test/parallel/test-cluster-rr-ref.js @@ -10,7 +10,7 @@ if (cluster.isMaster) { }); } else { const server = net.createServer(common.mustNotCall()); - server.listen(common.PORT, function() { + server.listen(0, function() { server.unref(); server.ref(); server.close(function() { diff --git a/test/parallel/test-cluster-shared-leak.js b/test/parallel/test-cluster-shared-leak.js index d578ee6373f3b6..a7b3023f3ed3ba 100644 --- a/test/parallel/test-cluster-shared-leak.js +++ b/test/parallel/test-cluster-shared-leak.js @@ -13,10 +13,10 @@ if (cluster.isMaster) { let conn, worker2; const worker1 = cluster.fork(); - worker1.on('message', common.mustCall(function() { + worker1.on('listening', common.mustCall(function(address) { worker2 = cluster.fork(); worker2.on('online', function() { - conn = net.connect(common.PORT, common.mustCall(function() { + conn = net.connect(address.port, common.mustCall(function() { worker1.disconnect(); worker2.disconnect(); })); @@ -48,6 +48,4 @@ const server = net.createServer(function(c) { c.end('bye'); }); -server.listen(common.PORT, function() { - process.send('listening'); -}); +server.listen(0); diff --git a/test/parallel/test-cluster-worker-no-exit.js b/test/parallel/test-cluster-worker-no-exit.js index 9cfd8401a0c678..11ecbfef144154 100644 --- a/test/parallel/test-cluster-worker-no-exit.js +++ b/test/parallel/test-cluster-worker-no-exit.js @@ -1,5 +1,5 @@ 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const cluster = require('cluster'); const net = require('net'); @@ -34,7 +34,7 @@ if (cluster.isMaster) { success = true; }); - }).listen(common.PORT, function() { + }).listen(0, function() { const port = this.address().port; worker = cluster.fork()