Skip to content

tests: remove common.PORT from cluster send tests #12472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

tests: remove common.PORT from cluster send tests #12472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions test/parallel/test-cluster-send-deadlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// Testing mutual send of handles: from master to worker, and from worker to
// master.

const common = require('../common');
require('../common');
const assert = require('assert');
const cluster = require('cluster');
const net = require('net');
Expand All @@ -40,14 +40,15 @@ if (cluster.isMaster) {
worker.send('handle', socket);
});

server.listen(common.PORT, function() {
worker.send('listen');
server.listen(0, function() {
worker.send({message: 'listen', port: server.address().port});
});
} else {
process.on('message', function(msg, handle) {
if (msg === 'listen') {
const client1 = net.connect({ host: 'localhost', port: common.PORT });
const client2 = net.connect({ host: 'localhost', port: common.PORT });
if (msg.message && msg.message === 'listen') {
assert(msg.port);
const client1 = net.connect({ host: 'localhost', port: msg.port });
const client2 = net.connect({ host: 'localhost', port: msg.port });
let waiting = 2;
client1.on('close', onclose);
client2.on('close', onclose);
Expand Down
7 changes: 5 additions & 2 deletions test/parallel/test-cluster-send-handle-twice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ if (cluster.isMaster) {
process.send('send-handle-2', socket);
});

server.listen(common.PORT, function() {
const client = net.connect({ host: 'localhost', port: common.PORT });
server.listen(0, function() {
const client = net.connect({
host: 'localhost',
port: server.address().port
});
client.on('close', common.mustCall(() => { cluster.worker.disconnect(); }));
setTimeout(function() { client.end(); }, 50);
}).on('error', function(e) {
Expand Down