diff options
author | Tarun Batra <tarun.batra00@gmail.com> | 2017-04-17 02:21:48 +0530 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-04-18 08:07:04 -0700 |
commit | 2e5188de928946c81266b149887d9b31111a5267 (patch) | |
tree | b66a630b14e2fe0e8f2ea01ad95de3711544594e /test | |
parent | 3cf88a45e86f28dcc72c730adf4ead919ab882bd (diff) | |
download | android-node-v8-2e5188de928946c81266b149887d9b31111a5267.tar.gz android-node-v8-2e5188de928946c81266b149887d9b31111a5267.tar.bz2 android-node-v8-2e5188de928946c81266b149887d9b31111a5267.zip |
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 <santiago.gimeno@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/parallel/test-cluster-master-error.js | 2 | ||||
-rw-r--r-- | test/parallel/test-cluster-master-kill.js | 2 | ||||
-rw-r--r-- | test/parallel/test-cluster-net-send.js | 4 | ||||
-rw-r--r-- | test/parallel/test-cluster-rr-domain-listen.js | 2 | ||||
-rw-r--r-- | test/parallel/test-cluster-rr-ref.js | 2 | ||||
-rw-r--r-- | test/parallel/test-cluster-shared-leak.js | 8 | ||||
-rw-r--r-- | test/parallel/test-cluster-worker-no-exit.js | 4 |
7 files changed, 11 insertions, 13 deletions
diff --git a/test/parallel/test-cluster-master-error.js b/test/parallel/test-cluster-master-error.js index ce5b8e5704..0a2dcc43fa 100644 --- a/test/parallel/test-cluster-master-error.js +++ b/test/parallel/test-cluster-master-error.js @@ -31,7 +31,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 a0550b8998..f195599b3f 100644 --- a/test/parallel/test-cluster-master-kill.js +++ b/test/parallel/test-cluster-master-kill.js @@ -28,7 +28,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 98c7bd2e66..bf0ee4e4f4 100644 --- a/test/parallel/test-cluster-net-send.js +++ b/test/parallel/test-cluster-net-send.js @@ -67,8 +67,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 b1b4f3f5a8..4b511d0d20 100644 --- a/test/parallel/test-cluster-rr-domain-listen.js +++ b/test/parallel/test-cluster-rr-domain-listen.js @@ -32,7 +32,7 @@ if (cluster.isWorker) { d.run(common.noop); const http = require('http'); - http.Server(common.noop).listen(common.PORT, '127.0.0.1'); + http.Server(common.noop).listen(0, '127.0.0.1'); } else if (cluster.isMaster) { diff --git a/test/parallel/test-cluster-rr-ref.js b/test/parallel/test-cluster-rr-ref.js index 19420fed83..cf5e4f346b 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 d578ee6373..a7b3023f3e 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 db6f0fc7a0..7dbe9fcb37 100644 --- a/test/parallel/test-cluster-worker-no-exit.js +++ b/test/parallel/test-cluster-worker-no-exit.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const cluster = require('cluster'); const net = require('net'); @@ -55,7 +55,7 @@ if (cluster.isMaster) { success = true; }); - }).listen(common.PORT, function() { + }).listen(0, function() { const port = this.address().port; worker = cluster.fork() |