X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=6d3592c1b5d2e2798c00b95fe213c1c630370c96;hb=4a2991331aa9ab339cf110856e8ce4752a0b3400;hp=f4cb38b23cb1ca63c5c6e17109af45d59f66dc0d;hpb=4af5c11ae8d0f0ac6dfe1e597fc231f9724a665f;p=poolifier.git diff --git a/tests/test-utils.js b/tests/test-utils.js index f4cb38b2..6d3592c1 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,14 +37,11 @@ class TestUtils { } static generateRandomInteger (max = Number.MAX_SAFE_INTEGER, min = 0) { - if (max < 0) { + if (max < min || max < 0 || min < 0) { throw new RangeError('Invalid interval') } max = Math.floor(max) if (min != null && min !== 0) { - if (max < min || min < 0) { - throw new RangeError('Invalid interval') - } min = Math.ceil(min) return Math.floor(Math.random() * (max - min + 1)) + min }