X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Ffixed.test.js;h=d1f24af425ee10ac95aa15c4cfe2b557da22bd1f;hb=a4e07f7216246b772e13783937a97c87105b8fc3;hp=c6cdce54617c36ffc05d76cfcfc5ff190cfda194;hpb=4f0b85b32d9241579bbfd4759c44d96e4c968a25;p=poolifier.git diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js index c6cdce54..d1f24af4 100644 --- a/tests/pools/cluster/fixed.test.js +++ b/tests/pools/cluster/fixed.test.js @@ -96,13 +96,13 @@ describe('Fixed cluster pool test suite', () => { } expect(promises.size).toBe(numberOfWorkers * maxMultiplier) for (const workerNode of queuePool.workerNodes) { - expect(workerNode.tasksUsage.running).toBeLessThanOrEqual( + expect(workerNode.workerUsage.tasks.executing).toBeLessThanOrEqual( queuePool.opts.tasksQueueOptions.concurrency ) - expect(workerNode.tasksUsage.ran).toBe(0) + expect(workerNode.workerUsage.tasks.executed).toBe(0) expect(workerNode.tasksQueue.size).toBeGreaterThan(0) } - expect(queuePool.info.runningTasks).toBe(numberOfWorkers) + expect(queuePool.info.executingTasks).toBe(numberOfWorkers) expect(queuePool.info.queuedTasks).toBe( numberOfWorkers * maxMultiplier - numberOfWorkers ) @@ -111,9 +111,11 @@ describe('Fixed cluster pool test suite', () => { ) await Promise.all(promises) for (const workerNode of queuePool.workerNodes) { - expect(workerNode.tasksUsage.running).toBe(0) - expect(workerNode.tasksUsage.ran).toBeGreaterThan(0) - expect(workerNode.tasksUsage.ran).toBeLessThanOrEqual(maxMultiplier) + expect(workerNode.workerUsage.tasks.executing).toBe(0) + expect(workerNode.workerUsage.tasks.executed).toBeGreaterThan(0) + expect(workerNode.workerUsage.tasks.executed).toBeLessThanOrEqual( + maxMultiplier + ) expect(workerNode.tasksQueue.size).toBe(0) } }) @@ -145,12 +147,12 @@ describe('Fixed cluster pool test suite', () => { expect(typeof inError === 'string').toBe(true) expect(inError).toBe('Error Message from ClusterWorker') expect(taskError).toStrictEqual({ - error: 'Error Message from ClusterWorker', - errorData: data + message: 'Error Message from ClusterWorker', + data }) expect( errorPool.workerNodes.some( - workerNode => workerNode.tasksUsage.error === 1 + workerNode => workerNode.workerUsage.tasks.failed === 1 ) ).toBe(true) }) @@ -171,12 +173,12 @@ describe('Fixed cluster pool test suite', () => { expect(typeof inError === 'string').toBe(true) expect(inError).toBe('Error Message from ClusterWorker:async') expect(taskError).toStrictEqual({ - error: 'Error Message from ClusterWorker:async', - errorData: data + message: 'Error Message from ClusterWorker:async', + data }) expect( asyncErrorPool.workerNodes.some( - workerNode => workerNode.tasksUsage.error === 1 + workerNode => workerNode.workerUsage.tasks.failed === 1 ) ).toBe(true) })