X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=894471697cb42cc408c906021ee28e87147fcfbc;hb=b529c323958350e8b54ccfb4096d0c661c975b71;hp=9a49c822991c2629ac45280776604cb3be188a04;hpb=9bc18a6d9bba455b461e484e182fae3dc56a5549;p=poolifier.git diff --git a/tests/test-utils.js b/tests/test-utils.js index 9a49c822..89447169 100644 --- a/tests/test-utils.js +++ b/tests/test-utils.js @@ -2,16 +2,16 @@ 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 + for (const workerItem of pool.workers) { + workerItem.worker.on('exit', () => { + ++exitEvents if (exitEvents === numberOfExitEventsToWait) { resolve(exitEvents) } }) - }) + } }) } @@ -37,8 +37,11 @@ class TestUtils { } static generateRandomInteger (max = Number.MAX_SAFE_INTEGER, min = 0) { + if (max < min || max < 0 || min < 0) { + throw new RangeError('Invalid interval') + } max = Math.floor(max) - if (min) { + if (min != null && min !== 0) { min = Math.ceil(min) return Math.floor(Math.random() * (max - min + 1)) + min } @@ -74,9 +77,8 @@ class TestUtils { static factorial (n) { if (n === 0) { return 1 - } else { - return TestUtils.factorial(n - 1) * n } + return TestUtils.factorial(n - 1) * n } static executeWorkerFunction (data) {