X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=0e71c718a8eee83c85011e10f417725811ae34f8;hb=027c221543826da4df348775499148557d3d437e;hp=116b1942b96829273eedb2d08ff83691ff61aa6f;hpb=548140e67db5a4d10e7712fc0830c196a3f81968;p=poolifier.git diff --git a/tests/test-utils.js b/tests/test-utils.js index 116b1942..0e71c718 100644 --- a/tests/test-utils.js +++ b/tests/test-utils.js @@ -2,16 +2,19 @@ const { WorkerFunctions } = require('./test-types') class TestUtils { static async waitExits (pool, numberOfExitEventsToWait) { - let exitEvents = 0 return new Promise(resolve => { - pool.workers.forEach(w => { - w.on('exit', () => { - exitEvents++ + let exitEvents = 0 + if (numberOfExitEventsToWait === 0) { + resolve(exitEvents) + } + for (const workerNode of pool.workerNodes) { + workerNode.worker.on('exit', () => { + ++exitEvents if (exitEvents === numberOfExitEventsToWait) { resolve(exitEvents) } }) - }) + } }) } @@ -59,7 +62,6 @@ class TestUtils { /** * Intentionally inefficient implementation. - * * @param {number} n - The number of fibonacci numbers to generate. * @returns {number} - The nth fibonacci number. */ @@ -70,16 +72,14 @@ class TestUtils { /** * Intentionally inefficient implementation. - * * @param {number} n - The number to calculate the factorial of. * @returns {number} - The factorial of n. */ static factorial (n) { if (n === 0) { return 1 - } else { - return TestUtils.factorial(n - 1) * n } + return TestUtils.factorial(n - 1) * n } static executeWorkerFunction (data) {