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

test: use Promise.all() in test-cluster-net-listen-ipv6only-false

Browse Source 
Use Promise.all() instead of countdown in
test-cluster-net-listen-ipv6only-false.

Signed-off-by: Rich Trott <rtrott@gmail.com>

PR-URL: https://github.com/nodejs/node/pull/32398
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Rich Trott 2020-03-20 20:11:15 -07:00
parent a1686e00ab
commit 2565442ac0
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/parallel/test-cluster-net-listen-ipv6only-false.js
View File

@ -7,7 +7,6 @@ if (!common.hasIPv6)
const assert = require('assert'); const assert = require('assert');
const cluster = require('cluster'); const cluster = require('cluster');
const net = require('net'); const net = require('net');
const Countdown = require('../common/countdown');
// This test ensures that dual-stack support still works for cluster module // This test ensures that dual-stack support still works for cluster module
// when `ipv6Only` is not `true`. // when `ipv6Only` is not `true`.
@ -18,20 +17,8 @@ if (cluster.isMaster) {
const workers = []; const workers = [];
let address; let address;
const countdown = new Countdown(WORKER_COUNT, () => {
const socket = net.connect({
port: address.port,
host: '0.0.0.0',
}, common.mustCall(() => {
socket.destroy();
workers.forEach((worker) => {
worker.disconnect();
});
}));
socket.on('error', common.mustNotCall());
});
for (let i = 0; i < WORKER_COUNT; i += 1) { for (let i = 0; i < WORKER_COUNT; i += 1) {
const myWorker = new Promise((resolve) => {
const worker = cluster.fork().on('exit', common.mustCall((statusCode) => { const worker = cluster.fork().on('exit', common.mustCall((statusCode) => {
assert.strictEqual(statusCode, 0); assert.strictEqual(statusCode, 0);
})).on('listening', common.mustCall((workerAddress) => { })).on('listening', common.mustCall((workerAddress) => {
@ -42,11 +29,25 @@ if (cluster.isMaster) {
assert.strictEqual(address.host, workerAddress.host); assert.strictEqual(address.host, workerAddress.host);
assert.strictEqual(address.port, workerAddress.port); assert.strictEqual(address.port, workerAddress.port);
} }
countdown.dec(); resolve(worker);
})); }));
});
workers[i] = worker; workers.push(myWorker);
} }
Promise.all(workers).then(common.mustCall((resolvedWorkers) => {
const socket = net.connect({
port: address.port,
host: '0.0.0.0',
}, common.mustCall(() => {
socket.destroy();
resolvedWorkers.forEach((resolvedWorker) => {
resolvedWorker.disconnect();
});
}));
socket.on('error', common.mustNotCall());
}));
} else { } else {
net.createServer().listen({ net.createServer().listen({
host, host,