X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fabstract%2Fabstract-pool.test.js;h=d4b147f78f4cd13e62aedbf5a8cac0af8d56884a;hb=f751010550f07200428ca708afb2ec1d242cf7a7;hp=7c42d34a99f09efd9b3314ecff6ce14ac016783f;hpb=d33d2d2fed43d102479c38cc28b496872665a90d;p=poolifier.git

diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js
index 7c42d34a..d4b147f7 100644
--- a/tests/pools/abstract/abstract-pool.test.js
+++ b/tests/pools/abstract/abstract-pool.test.js
@@ -11,6 +11,7 @@ const {
 } = require('../../../lib')
 const { CircularArray } = require('../../../lib/circular-array')
 const { Queue } = require('../../../lib/queue')
+const { version } = require('../../../package.json')
 
 describe('Abstract pool test suite', () => {
   const numberOfWorkers = 2
@@ -393,11 +394,11 @@ describe('Abstract pool test suite', () => {
       './tests/worker-files/thread/testWorker.js'
     )
     expect(pool.info).toStrictEqual({
+      version,
       type: PoolTypes.fixed,
       worker: WorkerTypes.thread,
       minSize: numberOfWorkers,
       maxSize: numberOfWorkers,
-      utilization: 0,
       workerNodes: numberOfWorkers,
       idleWorkerNodes: numberOfWorkers,
       busyWorkerNodes: 0,
@@ -407,9 +408,6 @@ describe('Abstract pool test suite', () => {
       maxQueuedTasks: 0,
       failedTasks: 0
     })
-    for (const workerNode of pool.workerNodes) {
-      console.log('thread:workerNode.info', workerNode.info)
-    }
     await pool.destroy()
     pool = new DynamicClusterPool(
       numberOfWorkers,
@@ -417,11 +415,11 @@ describe('Abstract pool test suite', () => {
       './tests/worker-files/cluster/testWorker.js'
     )
     expect(pool.info).toStrictEqual({
+      version,
       type: PoolTypes.dynamic,
       worker: WorkerTypes.cluster,
       minSize: numberOfWorkers,
       maxSize: numberOfWorkers * 2,
-      utilization: 0,
       workerNodes: numberOfWorkers,
       idleWorkerNodes: numberOfWorkers,
       busyWorkerNodes: 0,
@@ -431,9 +429,6 @@ describe('Abstract pool test suite', () => {
       maxQueuedTasks: 0,
       failedTasks: 0
     })
-    for (const workerNode of pool.workerNodes) {
-      console.log('cluster:workerNode.info', workerNode.info)
-    }
     await pool.destroy()
   })
 
@@ -468,12 +463,16 @@ describe('Abstract pool test suite', () => {
         },
         runTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
         },
         waitTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
@@ -481,17 +480,20 @@ describe('Abstract pool test suite', () => {
         elu: {
           idle: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
           },
           active: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
-          },
-          utilization: 0
+          }
         }
       })
     }
@@ -533,12 +535,16 @@ describe('Abstract pool test suite', () => {
         },
         runTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
         },
         waitTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
@@ -546,17 +552,20 @@ describe('Abstract pool test suite', () => {
         elu: {
           idle: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
           },
           active: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
-          },
-          utilization: 0
+          }
         }
       })
     }
@@ -572,12 +581,16 @@ describe('Abstract pool test suite', () => {
         },
         runTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
         },
         waitTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
@@ -585,17 +598,20 @@ describe('Abstract pool test suite', () => {
         elu: {
           idle: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
           },
           active: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
-          },
-          utilization: 0
+          }
         }
       })
     }
@@ -625,12 +641,16 @@ describe('Abstract pool test suite', () => {
         },
         runTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
         },
         waitTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
@@ -638,17 +658,20 @@ describe('Abstract pool test suite', () => {
         elu: {
           idle: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
           },
           active: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
-          },
-          utilization: 0
+          }
         }
       })
       expect(workerNode.usage.tasks.executed).toBeGreaterThan(0)
@@ -666,12 +689,16 @@ describe('Abstract pool test suite', () => {
         },
         runTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
         },
         waitTime: {
           aggregate: 0,
+          maximum: 0,
+          minimum: 0,
           average: 0,
           median: 0,
           history: expect.any(CircularArray)
@@ -679,17 +706,20 @@ describe('Abstract pool test suite', () => {
         elu: {
           idle: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
           },
           active: {
             aggregate: 0,
+            maximum: 0,
+            minimum: 0,
             average: 0,
             median: 0,
             history: expect.any(CircularArray)
-          },
-          utilization: 0
+          }
         }
       })
       expect(workerNode.usage.runTime.history.length).toBe(0)
@@ -719,11 +749,11 @@ describe('Abstract pool test suite', () => {
     // So in total numberOfWorkers * 2 times for a loop submitting up to numberOfWorkers * 2 tasks to the dynamic pool with min = max = numberOfWorkers.
     expect(poolFull).toBe(numberOfWorkers * 2)
     expect(poolInfo).toStrictEqual({
+      version,
       type: PoolTypes.dynamic,
       worker: WorkerTypes.thread,
       minSize: expect.any(Number),
       maxSize: expect.any(Number),
-      utilization: 0,
       workerNodes: expect.any(Number),
       idleWorkerNodes: expect.any(Number),
       busyWorkerNodes: expect.any(Number),
@@ -756,11 +786,11 @@ describe('Abstract pool test suite', () => {
     // So in total numberOfWorkers + 1 times for a loop submitting up to numberOfWorkers * 2 tasks to the fixed pool.
     expect(poolBusy).toBe(numberOfWorkers + 1)
     expect(poolInfo).toStrictEqual({
+      version,
       type: PoolTypes.fixed,
       worker: WorkerTypes.thread,
       minSize: expect.any(Number),
       maxSize: expect.any(Number),
-      utilization: 0,
       workerNodes: expect.any(Number),
       idleWorkerNodes: expect.any(Number),
       busyWorkerNodes: expect.any(Number),