X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fabstract-pool.test.mjs;h=cf4b55afc26a6a1278f886a0d4c2762b1c230f07;hb=50e947c7cee354eb4ced20cd08682b912f4b1103;hp=6bb6e1a613cc437a1f0cbc1bf2a781fe0da21fe6;hpb=69bba5e2db6d6895a327efaa815559d58a836c33;p=poolifier.git

diff --git a/tests/pools/abstract-pool.test.mjs b/tests/pools/abstract-pool.test.mjs
index 6bb6e1a6..cf4b55af 100644
--- a/tests/pools/abstract-pool.test.mjs
+++ b/tests/pools/abstract-pool.test.mjs
@@ -242,20 +242,18 @@ describe('Abstract pool test suite', () => {
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual(
-        expect.objectContaining({
-          retries:
-            pool.info.maxSize +
-            Object.keys(workerChoiceStrategy.opts.weights).length,
-          runTime: { median: false },
-          waitTime: { median: false },
-          elu: { median: false }
-          // weights: expect.objectContaining({
-          //   0: expect.any(Number),
-          //   [pool.info.maxSize - 1]: expect.any(Number)
-          // })
+      expect(workerChoiceStrategy.opts).toStrictEqual({
+        retries:
+          pool.info.maxSize +
+          Object.keys(workerChoiceStrategy.opts.weights).length,
+        runTime: { median: false },
+        waitTime: { median: false },
+        elu: { median: false },
+        weights: expect.objectContaining({
+          0: expect.any(Number),
+          [pool.info.maxSize - 1]: expect.any(Number)
         })
-      )
+      })
     }
     await pool.destroy()
     const testHandler = () => console.info('test handler executed')
@@ -486,20 +484,18 @@ describe('Abstract pool test suite', () => {
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual(
-        expect.objectContaining({
-          retries:
-            pool.info.maxSize +
-            Object.keys(workerChoiceStrategy.opts.weights).length,
-          runTime: { median: false },
-          waitTime: { median: false },
-          elu: { median: false }
-          // weights: expect.objectContaining({
-          //   0: expect.any(Number),
-          //   [pool.info.maxSize - 1]: expect.any(Number)
-          // })
+      expect(workerChoiceStrategy.opts).toStrictEqual({
+        retries:
+          pool.info.maxSize +
+          Object.keys(workerChoiceStrategy.opts.weights).length,
+        runTime: { median: false },
+        waitTime: { median: false },
+        elu: { median: false },
+        weights: expect.objectContaining({
+          0: expect.any(Number),
+          [pool.info.maxSize - 1]: expect.any(Number)
         })
-      )
+      })
     }
     expect(
       pool.workerChoiceStrategyContext.getTaskStatisticsRequirements()
@@ -542,20 +538,18 @@ describe('Abstract pool test suite', () => {
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual(
-        expect.objectContaining({
-          retries:
-            pool.info.maxSize +
-            Object.keys(workerChoiceStrategy.opts.weights).length,
-          runTime: { median: true },
-          waitTime: { median: false },
-          elu: { median: true }
-          // weights: expect.objectContaining({
-          //   0: expect.any(Number),
-          //   [pool.info.maxSize - 1]: expect.any(Number)
-          // })
+      expect(workerChoiceStrategy.opts).toStrictEqual({
+        retries:
+          pool.info.maxSize +
+          Object.keys(workerChoiceStrategy.opts.weights).length,
+        runTime: { median: true },
+        waitTime: { median: false },
+        elu: { median: true },
+        weights: expect.objectContaining({
+          0: expect.any(Number),
+          [pool.info.maxSize - 1]: expect.any(Number)
         })
-      )
+      })
     }
     expect(
       pool.workerChoiceStrategyContext.getTaskStatisticsRequirements()
@@ -598,20 +592,18 @@ describe('Abstract pool test suite', () => {
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual(
-        expect.objectContaining({
-          retries:
-            pool.info.maxSize +
-            Object.keys(workerChoiceStrategy.opts.weights).length,
-          runTime: { median: false },
-          waitTime: { median: false },
-          elu: { median: false }
-          // weights: expect.objectContaining({
-          //   0: expect.any(Number),
-          //   [pool.info.maxSize - 1]: expect.any(Number)
-          // })
+      expect(workerChoiceStrategy.opts).toStrictEqual({
+        retries:
+          pool.info.maxSize +
+          Object.keys(workerChoiceStrategy.opts.weights).length,
+        runTime: { median: false },
+        waitTime: { median: false },
+        elu: { median: false },
+        weights: expect.objectContaining({
+          0: expect.any(Number),
+          [pool.info.maxSize - 1]: expect.any(Number)
         })
-      )
+      })
     }
     expect(
       pool.workerChoiceStrategyContext.getTaskStatisticsRequirements()
@@ -890,7 +882,8 @@ describe('Abstract pool test suite', () => {
         id: expect.any(Number),
         type: WorkerTypes.cluster,
         dynamic: false,
-        ready: true
+        ready: true,
+        stealing: false
       })
     }
     await pool.destroy()
@@ -905,7 +898,8 @@ describe('Abstract pool test suite', () => {
         id: expect.any(Number),
         type: WorkerTypes.thread,
         dynamic: false,
-        ready: true
+        ready: true,
+        stealing: false
       })
     }
     await pool.destroy()
@@ -1277,6 +1271,7 @@ describe('Abstract pool test suite', () => {
       maxSize: expect.any(Number),
       workerNodes: expect.any(Number),
       idleWorkerNodes: expect.any(Number),
+      stealingWorkerNodes: expect.any(Number),
       busyWorkerNodes: expect.any(Number),
       executedTasks: expect.any(Number),
       executingTasks: expect.any(Number),
@@ -1286,7 +1281,7 @@ describe('Abstract pool test suite', () => {
       stolenTasks: expect.any(Number),
       failedTasks: expect.any(Number)
     })
-    expect(pool.hasBackPressure.callCount).toBe(5)
+    expect(pool.hasBackPressure.callCount).toBeGreaterThanOrEqual(7)
     await pool.destroy()
   })
 
@@ -1314,9 +1309,9 @@ describe('Abstract pool test suite', () => {
     const startTime = performance.now()
     await pool.destroy()
     const elapsedTime = performance.now() - startTime
-    expect(tasksFinished).toBe(numberOfWorkers * maxMultiplier)
+    expect(tasksFinished).toBeLessThanOrEqual(numberOfWorkers * maxMultiplier)
     expect(elapsedTime).toBeGreaterThanOrEqual(2000)
-    expect(elapsedTime).toBeLessThanOrEqual(tasksFinishedTimeout + 100)
+    expect(elapsedTime).toBeLessThanOrEqual(tasksFinishedTimeout + 400)
   })
 
   it('Verify that destroy() waits until the tasks finished timeout is reached', async () => {
@@ -1344,7 +1339,7 @@ describe('Abstract pool test suite', () => {
     await pool.destroy()
     const elapsedTime = performance.now() - startTime
     expect(tasksFinished).toBe(0)
-    expect(elapsedTime).toBeLessThanOrEqual(tasksFinishedTimeout + 600)
+    expect(elapsedTime).toBeLessThanOrEqual(tasksFinishedTimeout + 800)
   })
 
   it('Verify that pool asynchronous resource track tasks execution', async () => {
@@ -1682,11 +1677,6 @@ describe('Abstract pool test suite', () => {
     await expect(
       pool.sendKillMessageToWorker(workerNodeKey)
     ).resolves.toBeUndefined()
-    await expect(
-      pool.sendKillMessageToWorker(numberOfWorkers)
-    ).rejects.toStrictEqual(
-      new Error(`Invalid worker node key '${numberOfWorkers}'`)
-    )
     await pool.destroy()
   })