X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=7314f261dffee839dd15e44b26eece688920ecfa;hb=ffcbbad84f63b8a77f2b1a08f82deef5430f646e;hp=a3affb61c91899d187dd91e97f2693cfa7340d0d;hpb=f931db5c2405593ceeef6e3ea86c784e6cf82165;p=poolifier.git diff --git a/tests/test-utils.js b/tests/test-utils.js index a3affb61..7314f261 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 value of pool.workers.values()) { + value.worker.on('exit', () => { + ++exitEvents if (exitEvents === numberOfExitEventsToWait) { resolve(exitEvents) } }) - }) + } }) } @@ -36,9 +36,12 @@ class TestUtils { }) } - static generateRandomInteger (max, min = 0) { + 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 }