1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: dynamic port in parallel cluster tests

Browse Source 
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: https://github.com/nodejs/node/pull/12584
Ref: https://github.com/nodejs/node/issues/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>
This commit is contained in:
Sebastian Plesciuc 2017-04-22 13:07:30 +03:00 committed by James M Snell
parent 549e81bfa1
commit 0105e6f826
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/parallel/test-cluster-message.js
View File

@ -20,7 +20,7 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
'use strict'; 'use strict';
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const cluster = require('cluster'); const cluster = require('cluster');
const net = require('net'); const net = require('net');
@ -60,7 +60,7 @@ if (cluster.isWorker) {
maybeReply(); maybeReply();
}); });
server.listen(common.PORT, '127.0.0.1'); server.listen(0, '127.0.0.1');
} else if (cluster.isMaster) { } else if (cluster.isMaster) {
const checks = { const checks = {
@ -109,9 +109,9 @@ if (cluster.isWorker) {
}); });
// When a TCP server is listening in the worker connect to it // When a TCP server is listening in the worker connect to it
worker.on('listening', function() { worker.on('listening', function(address) {
client = net.connect(common.PORT, function() { client = net.connect(address.port, function() {
// Send message to worker. // Send message to worker.
worker.send('message from master'); worker.send('message from master');
}); });

4
test/parallel/test-cluster-server-restart-none.js
View File

@ -23,10 +23,10 @@ if (cluster.isMaster) {
} else { } else {
const net = require('net'); const net = require('net');
const server = net.createServer(); const server = net.createServer();
server.listen(common.PORT, common.mustCall(() => { server.listen(0, common.mustCall(() => {
if (cluster.worker.id === 2) { if (cluster.worker.id === 2) {
server.close(() => { server.close(() => {
server.listen(common.PORT, common.mustCall(() => { server.listen(0, common.mustCall(() => {
server.close(() => { server.close(() => {
process.disconnect(); process.disconnect();
}); });

4
test/parallel/test-cluster-server-restart-rr.js
View File

@ -23,10 +23,10 @@ if (cluster.isMaster) {
} else { } else {
const net = require('net'); const net = require('net');
const server = net.createServer(); const server = net.createServer();
server.listen(common.PORT, common.mustCall(() => { server.listen(0, common.mustCall(() => {
if (cluster.worker.id === 2) { if (cluster.worker.id === 2) {
server.close(() => { server.close(() => {
server.listen(common.PORT, common.mustCall(() => { server.listen(0, common.mustCall(() => {
server.close(() => { server.close(() => {
process.disconnect(); process.disconnect();
}); });

7
test/parallel/test-cluster-shared-handle-bind-error.js
View File

@ -31,16 +31,17 @@ if (cluster.isMaster) {
// Hog the TCP port so that when the worker tries to bind, it'll fail. // Hog the TCP port so that when the worker tries to bind, it'll fail.
const server = net.createServer(common.mustNotCall()); const server = net.createServer(common.mustNotCall());
server.listen(common.PORT, common.mustCall(() => { server.listen(0, common.mustCall(() => {
const worker = cluster.fork(); const worker = cluster.fork({PORT: server.address().port});
worker.on('exit', common.mustCall((exitCode) => { worker.on('exit', common.mustCall((exitCode) => {
assert.strictEqual(exitCode, 0); assert.strictEqual(exitCode, 0);
server.close(); server.close();
})); }));
})); }));
} else { } else {
assert(process.env.PORT);
const s = net.createServer(common.mustNotCall()); const s = net.createServer(common.mustNotCall());
s.listen(common.PORT, common.mustNotCall('listen should have failed')); s.listen(process.env.PORT, common.mustNotCall('listen should have failed'));
s.on('error', common.mustCall((err) => { s.on('error', common.mustCall((err) => {
assert.strictEqual(err.code, 'EADDRINUSE'); assert.strictEqual(err.code, 'EADDRINUSE');
process.disconnect(); process.disconnect();