Skip to content

Commit 14e93f6

Browse files
Sebastian Plesciucevanlucas
Sebastian Plesciuc
authored andcommitted
test: dynamic port in parallel cluster tests
Removed common.PORT from test-cluster-message, test-cluster-server-restart-none, test-cluster-server-restart-rr and test-cluster-shared-handle-bind-error to eliminate the possibility that a dynamic port used in another test will collide with common.PORT. PR-URL: #12584 Ref: #12376 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]>
1 parent d10eb83 commit 14e93f6

4 files changed

+12
-11
lines changed

test/parallel/test-cluster-message.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
const common = require('../common');
2+
require('../common');
33
const assert = require('assert');
44
const cluster = require('cluster');
55
const net = require('net');
@@ -39,7 +39,7 @@ if (cluster.isWorker) {
3939
maybeReply();
4040
});
4141

42-
server.listen(common.PORT, '127.0.0.1');
42+
server.listen(0, '127.0.0.1');
4343
} else if (cluster.isMaster) {
4444

4545
const checks = {
@@ -88,9 +88,9 @@ if (cluster.isWorker) {
8888
});
8989

9090
// When a TCP server is listening in the worker connect to it
91-
worker.on('listening', function() {
91+
worker.on('listening', function(address) {
9292

93-
client = net.connect(common.PORT, function() {
93+
client = net.connect(address.port, function() {
9494
// Send message to worker.
9595
worker.send('message from master');
9696
});

test/parallel/test-cluster-server-restart-none.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ if (cluster.isMaster) {
2323
} else {
2424
const net = require('net');
2525
const server = net.createServer();
26-
server.listen(common.PORT, common.mustCall(() => {
26+
server.listen(0, common.mustCall(() => {
2727
if (cluster.worker.id === 2) {
2828
server.close(() => {
29-
server.listen(common.PORT, common.mustCall(() => {
29+
server.listen(0, common.mustCall(() => {
3030
server.close(() => {
3131
process.disconnect();
3232
});

test/parallel/test-cluster-server-restart-rr.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ if (cluster.isMaster) {
2323
} else {
2424
const net = require('net');
2525
const server = net.createServer();
26-
server.listen(common.PORT, common.mustCall(() => {
26+
server.listen(0, common.mustCall(() => {
2727
if (cluster.worker.id === 2) {
2828
server.close(() => {
29-
server.listen(common.PORT, common.mustCall(() => {
29+
server.listen(0, common.mustCall(() => {
3030
server.close(() => {
3131
process.disconnect();
3232
});

test/parallel/test-cluster-shared-handle-bind-error.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ if (cluster.isMaster) {
1010
// Hog the TCP port so that when the worker tries to bind, it'll fail.
1111
const server = net.createServer(common.mustNotCall());
1212

13-
server.listen(common.PORT, common.mustCall(() => {
14-
const worker = cluster.fork();
13+
server.listen(0, common.mustCall(() => {
14+
const worker = cluster.fork({PORT: server.address().port});
1515
worker.on('exit', common.mustCall((exitCode) => {
1616
assert.strictEqual(exitCode, 0);
1717
server.close();
1818
}));
1919
}));
2020
} else {
21+
assert(process.env.PORT);
2122
const s = net.createServer(common.mustNotCall());
22-
s.listen(common.PORT, common.mustNotCall('listen should have failed'));
23+
s.listen(process.env.PORT, common.mustNotCall('listen should have failed'));
2324
s.on('error', common.mustCall((err) => {
2425
assert.strictEqual(err.code, 'EADDRINUSE');
2526
process.disconnect();

0 commit comments

Comments
 (0)