X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Ffixed.test.js;h=2cba2d8b7c1d09435538d547f9e6674e9427c36e;hb=d46660cd0cccf38566337876c3fad0c3795aeb94;hp=8234fab9a5f4f4e62b72f8ecdabd51b94f046c4d;hpb=5dd39e0fba309bb3af0ca64aea5205f57dfe5d24;p=poolifier.git

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index 8234fab9..2cba2d8b 100644
--- a/tests/pools/cluster/fixed.test.js
+++ b/tests/pools/cluster/fixed.test.js
@@ -89,8 +89,8 @@ describe('Fixed cluster pool test suite', () => {
   })
 
   it('Verify that tasks queuing is working', async () => {
-    const maxMultiplier = 10
     const promises = new Set()
+    const maxMultiplier = 2
     for (let i = 0; i < numberOfWorkers * maxMultiplier; i++) {
       promises.add(queuePool.execute())
     }
@@ -99,20 +99,23 @@ describe('Fixed cluster pool test suite', () => {
       expect(workerNode.tasksUsage.running).toBeLessThanOrEqual(
         queuePool.opts.tasksQueueOptions.concurrency
       )
-      expect(workerNode.tasksUsage.run).toBe(0)
+      expect(workerNode.tasksUsage.ran).toBe(0)
       expect(workerNode.tasksQueue.size).toBeGreaterThan(0)
     }
-    expect(queuePool.numberOfRunningTasks).toBe(numberOfWorkers)
-    expect(queuePool.numberOfQueuedTasks).toBe(
+    expect(queuePool.info.runningTasks).toBe(numberOfWorkers)
+    expect(queuePool.info.queuedTasks).toBe(
+      numberOfWorkers * maxMultiplier - numberOfWorkers
+    )
+    expect(queuePool.info.maxQueuedTasks).toBe(
       numberOfWorkers * maxMultiplier - numberOfWorkers
     )
     await Promise.all(promises)
     for (const workerNode of queuePool.workerNodes) {
       expect(workerNode.tasksUsage.running).toBe(0)
-      expect(workerNode.tasksUsage.run).toBeGreaterThan(0)
+      expect(workerNode.tasksUsage.ran).toBeGreaterThan(0)
+      expect(workerNode.tasksUsage.ran).toBeLessThanOrEqual(maxMultiplier)
       expect(workerNode.tasksQueue.size).toBe(0)
     }
-    promises.clear()
   })
 
   it('Verify that is possible to have a worker that return undefined', async () => {
@@ -128,6 +131,10 @@ describe('Fixed cluster pool test suite', () => {
 
   it('Verify that error handling is working properly:sync', async () => {
     const data = { f: 10 }
+    let taskError
+    errorPool.emitter.on(PoolEvents.taskError, e => {
+      taskError = e
+    })
     let inError
     try {
       await errorPool.execute(data)
@@ -137,6 +144,10 @@ describe('Fixed cluster pool test suite', () => {
     expect(inError).toBeDefined()
     expect(typeof inError === 'string').toBe(true)
     expect(inError).toBe('Error Message from ClusterWorker')
+    expect(taskError).toStrictEqual({
+      error: 'Error Message from ClusterWorker',
+      errorData: data
+    })
     expect(
       errorPool.workerNodes.some(
         workerNode => workerNode.tasksUsage.error === 1
@@ -146,6 +157,10 @@ describe('Fixed cluster pool test suite', () => {
 
   it('Verify that error handling is working properly:async', async () => {
     const data = { f: 10 }
+    // let taskError
+    // errorPool.emitter.on(PoolEvents.taskError, e => {
+    //   taskError = e
+    // })
     let inError
     try {
       await asyncErrorPool.execute(data)
@@ -155,6 +170,10 @@ describe('Fixed cluster pool test suite', () => {
     expect(inError).toBeDefined()
     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
+    // })
     expect(
       asyncErrorPool.workerNodes.some(
         workerNode => workerNode.tasksUsage.error === 1