Skip to content

Commit 0105e6f

Browse files
Sebastian Plesciucjasnell
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 <cjihrig@gmail.com> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
1 parent 549e81b commit 0105e6f

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

test/parallel/test-cluster-message.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

2222
'use strict';
23-
const common = require('../common');
23+
require('../common');
2424
const assert = require('assert');
2525
const cluster = require('cluster');
2626
const net = require('net');
@@ -60,7 +60,7 @@ if (cluster.isWorker) {
6060
maybeReply();
6161
});
6262

63-
server.listen(common.PORT, '127.0.0.1');
63+
server.listen(0, '127.0.0.1');
6464
} else if (cluster.isMaster) {
6565

6666
const checks = {
@@ -109,9 +109,9 @@ if (cluster.isWorker) {
109109
});
110110

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

114-
client = net.connect(common.PORT, function() {
114+
client = net.connect(address.port, function() {
115115
// Send message to worker.
116116
worker.send('message from master');
117117
});

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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@ if (cluster.isMaster) {
3131
// Hog the TCP port so that when the worker tries to bind, it'll fail.
3232
const server = net.createServer(common.mustNotCall());
3333

34-
server.listen(common.PORT, common.mustCall(() => {
35-
const worker = cluster.fork();
34+
server.listen(0, common.mustCall(() => {
35+
const worker = cluster.fork({PORT: server.address().port});
3636
worker.on('exit', common.mustCall((exitCode) => {
3737
assert.strictEqual(exitCode, 0);
3838
server.close();
3939
}));
4040
}));
4141
} else {
42+
assert(process.env.PORT);
4243
const s = net.createServer(common.mustNotCall());
43-
s.listen(common.PORT, common.mustNotCall('listen should have failed'));
44+
s.listen(process.env.PORT, common.mustNotCall('listen should have failed'));
4445
s.on('error', common.mustCall((err) => {
4546
assert.strictEqual(err.code, 'EADDRINUSE');
4647
process.disconnect();

0 commit comments

Comments
 (0)