X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fabstract-pool.test.mjs;h=f26efdd846b5e86ae026306105f34ca030f9d4ca;hb=146eaa19f0f0ad8b0aecfef0ad3d8552dd064f33;hp=29f038c77b1e6e614b9ab9f15ee9cdbc1511cf7f;hpb=449cd15417158c0d1675a8aec8bcc514ff33b5a3;p=poolifier.git

diff --git a/tests/pools/abstract-pool.test.mjs b/tests/pools/abstract-pool.test.mjs
index 29f038c7..f26efdd8 100644
--- a/tests/pools/abstract-pool.test.mjs
+++ b/tests/pools/abstract-pool.test.mjs
@@ -229,19 +229,29 @@ describe('Abstract pool test suite', () => {
       workerChoiceStrategy: WorkerChoiceStrategies.ROUND_ROBIN
     })
     expect(pool.workerChoiceStrategyContext.opts).toStrictEqual({
-      retries: pool.info.maxSize,
+      retries:
+        pool.info.maxSize +
+        Object.keys(pool.workerChoiceStrategyContext.opts.weights).length,
       runTime: { median: false },
       waitTime: { median: false },
-      elu: { median: false }
+      elu: { median: false },
+      weights: expect.objectContaining({
+        0: expect.any(Number),
+        [pool.info.maxSize - 1]: expect.any(Number)
+      })
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual({
-        retries: pool.info.maxSize,
-        runTime: { median: false },
-        waitTime: { median: false },
-        elu: { median: false }
-      })
+      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 }
+        })
+      )
     }
     await pool.destroy()
     const testHandler = () => console.info('test handler executed')
@@ -459,19 +469,29 @@ describe('Abstract pool test suite', () => {
     )
     expect(pool.opts.workerChoiceStrategyOptions).toBeUndefined()
     expect(pool.workerChoiceStrategyContext.opts).toStrictEqual({
-      retries: pool.info.maxSize,
+      retries:
+        pool.info.maxSize +
+        Object.keys(pool.workerChoiceStrategyContext.opts.weights).length,
       runTime: { median: false },
       waitTime: { median: false },
-      elu: { median: false }
+      elu: { median: false },
+      weights: expect.objectContaining({
+        0: expect.any(Number),
+        [pool.info.maxSize - 1]: expect.any(Number)
+      })
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual({
-        retries: pool.info.maxSize,
-        runTime: { median: false },
-        waitTime: { median: false },
-        elu: { median: false }
-      })
+      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 }
+        })
+      )
     }
     expect(
       pool.workerChoiceStrategyContext.getTaskStatisticsRequirements()
@@ -501,19 +521,29 @@ describe('Abstract pool test suite', () => {
       elu: { median: true }
     })
     expect(pool.workerChoiceStrategyContext.opts).toStrictEqual({
-      retries: pool.info.maxSize,
+      retries:
+        pool.info.maxSize +
+        Object.keys(pool.workerChoiceStrategyContext.opts.weights).length,
       runTime: { median: true },
       waitTime: { median: false },
-      elu: { median: true }
+      elu: { median: true },
+      weights: expect.objectContaining({
+        0: expect.any(Number),
+        [pool.info.maxSize - 1]: expect.any(Number)
+      })
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual({
-        retries: pool.info.maxSize,
-        runTime: { median: true },
-        waitTime: { median: false },
-        elu: { median: true }
-      })
+      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 }
+        })
+      )
     }
     expect(
       pool.workerChoiceStrategyContext.getTaskStatisticsRequirements()
@@ -543,19 +573,29 @@ describe('Abstract pool test suite', () => {
       elu: { median: false }
     })
     expect(pool.workerChoiceStrategyContext.opts).toStrictEqual({
-      retries: pool.info.maxSize,
+      retries:
+        pool.info.maxSize +
+        Object.keys(pool.workerChoiceStrategyContext.opts.weights).length,
       runTime: { median: false },
       waitTime: { median: false },
-      elu: { median: false }
+      elu: { median: false },
+      weights: expect.objectContaining({
+        0: expect.any(Number),
+        [pool.info.maxSize - 1]: expect.any(Number)
+      })
     })
     for (const [, workerChoiceStrategy] of pool.workerChoiceStrategyContext
       .workerChoiceStrategies) {
-      expect(workerChoiceStrategy.opts).toStrictEqual({
-        retries: pool.info.maxSize,
-        runTime: { median: false },
-        waitTime: { median: false },
-        elu: { median: false }
-      })
+      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 }
+        })
+      )
     }
     expect(
       pool.workerChoiceStrategyContext.getTaskStatisticsRequirements()