X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=e4b99a6378d226535f83e47fb5516e3d394212f2;hb=4e377863ebacc8cead467297d0365e93dec491c3;hp=99b867786b62d95454dc660201f14c55254094d5;hpb=81c02522f2c5538a8e5ce341678724132d4da8ba;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 99b86778..e4b99a63 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -5,6 +5,7 @@ const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils')
 
 describe('Fixed thread pool test suite', () => {
   const numberOfThreads = 6
+  const tasksConcurrency = 2
   const pool = new FixedThreadPool(
     numberOfThreads,
     './tests/worker-files/thread/testWorker.js',
@@ -18,7 +19,7 @@ describe('Fixed thread pool test suite', () => {
     {
       enableTasksQueue: true,
       tasksQueueOptions: {
-        concurrency: 2
+        concurrency: tasksConcurrency
       },
       errorHandler: e => console.error(e)
     }
@@ -104,7 +105,7 @@ describe('Fixed thread pool test suite', () => {
 
   it('Verify that tasks queuing is working', async () => {
     const promises = new Set()
-    const maxMultiplier = 2
+    const maxMultiplier = 3 // Must be greater than tasksConcurrency
     for (let i = 0; i < numberOfThreads * maxMultiplier; i++) {
       promises.add(queuePool.execute())
     }
@@ -114,23 +115,32 @@ describe('Fixed thread pool test suite', () => {
         queuePool.opts.tasksQueueOptions.concurrency
       )
       expect(workerNode.usage.tasks.executed).toBe(0)
-      expect(workerNode.usage.tasks.queued).toBeGreaterThan(0)
-      expect(workerNode.usage.tasks.maxQueued).toBeGreaterThan(0)
+      expect(workerNode.usage.tasks.queued).toBe(
+        maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency
+      )
+      expect(workerNode.usage.tasks.maxQueued).toBe(
+        maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency
+      )
     }
-    expect(queuePool.info.executingTasks).toBe(numberOfThreads)
+    expect(queuePool.info.executingTasks).toBe(
+      numberOfThreads * queuePool.opts.tasksQueueOptions.concurrency
+    )
     expect(queuePool.info.queuedTasks).toBe(
-      numberOfThreads * maxMultiplier - numberOfThreads
+      numberOfThreads *
+        (maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency)
     )
     expect(queuePool.info.maxQueuedTasks).toBe(
-      numberOfThreads * maxMultiplier - numberOfThreads
+      numberOfThreads *
+        (maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency)
     )
     await Promise.all(promises)
     for (const workerNode of queuePool.workerNodes) {
       expect(workerNode.usage.tasks.executing).toBe(0)
-      expect(workerNode.usage.tasks.executed).toBeGreaterThan(0)
-      expect(workerNode.usage.tasks.executed).toBeLessThanOrEqual(maxMultiplier)
+      expect(workerNode.usage.tasks.executed).toBe(maxMultiplier)
       expect(workerNode.usage.tasks.queued).toBe(0)
-      expect(workerNode.usage.tasks.maxQueued).toBe(1)
+      expect(workerNode.usage.tasks.maxQueued).toBe(
+        maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency
+      )
     }
   })