X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fabstract%2Fabstract-pool.test.js;h=d4b147f78f4cd13e62aedbf5a8cac0af8d56884a;hb=f751010550f07200428ca708afb2ec1d242cf7a7;hp=32f5bbeefa611bad7d32967d4701f99ebefd6cdd;hpb=f65efa796405c785a1ab5e646e30fc27418a6151;p=poolifier.git diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js index 32f5bbee..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,6 +394,7 @@ describe('Abstract pool test suite', () => { './tests/worker-files/thread/testWorker.js' ) expect(pool.info).toStrictEqual({ + version, type: PoolTypes.fixed, worker: WorkerTypes.thread, minSize: numberOfWorkers, @@ -406,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, @@ -416,6 +415,7 @@ describe('Abstract pool test suite', () => { './tests/worker-files/cluster/testWorker.js' ) expect(pool.info).toStrictEqual({ + version, type: PoolTypes.dynamic, worker: WorkerTypes.cluster, minSize: numberOfWorkers, @@ -429,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() }) @@ -466,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) @@ -479,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 + } } }) } @@ -531,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) @@ -544,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 + } } }) } @@ -570,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) @@ -583,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 + } } }) } @@ -623,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) @@ -636,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) @@ -664,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) @@ -677,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) @@ -717,6 +749,7 @@ 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), @@ -753,6 +786,7 @@ 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),