X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fabstract%2Fabstract-pool.test.js;h=4224f4ffe7a9e87bdc86169ef66a7b1437352c53;hb=7fd82a1cb4d9d43e0f44333db35d3c4ad694e010;hp=96dc9a10ad4120a97455cd11d43e9bae38790c3c;hpb=e1ffb94fcac39a7459c47edaa086a7729a1dec44;p=poolifier.git

diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js
index 96dc9a10..4224f4ff 100644
--- a/tests/pools/abstract/abstract-pool.test.js
+++ b/tests/pools/abstract/abstract-pool.test.js
@@ -1,6 +1,7 @@
 const { expect } = require('expect')
 const {
   FixedClusterPool,
+  DynamicThreadPool,
   FixedThreadPool,
   WorkerChoiceStrategies
 } = require('../../../lib/index')
@@ -74,7 +75,7 @@ describe('Abstract pool test suite', () => {
     )
   })
 
-  it('Verify that pool options are checked', () => {
+  it('Verify that pool options are checked', async () => {
     let pool = new FixedThreadPool(
       numberOfWorkers,
       './tests/worker-files/thread/testWorker.js'
@@ -88,7 +89,7 @@ describe('Abstract pool test suite', () => {
     expect(pool.opts.errorHandler).toBeUndefined()
     expect(pool.opts.onlineHandler).toBeUndefined()
     expect(pool.opts.exitHandler).toBeUndefined()
-    pool.destroy()
+    await pool.destroy()
     const testHandler = () => console.log('test handler executed')
     pool = new FixedThreadPool(
       numberOfWorkers,
@@ -111,10 +112,10 @@ describe('Abstract pool test suite', () => {
     expect(pool.opts.errorHandler).toStrictEqual(testHandler)
     expect(pool.opts.onlineHandler).toStrictEqual(testHandler)
     expect(pool.opts.exitHandler).toStrictEqual(testHandler)
-    pool.destroy()
+    await pool.destroy()
   })
 
-  it('Simulate worker not found during increaseWorkerRunningTasks', () => {
+  it('Simulate worker not found during increaseWorkerRunningTasks', async () => {
     const pool = new StubPoolWithWorkerTasksUsageMapClear(
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
@@ -124,10 +125,10 @@ describe('Abstract pool test suite', () => {
     expect(() => pool.increaseWorkerRunningTasks()).toThrowError(
       workerNotFoundInTasksUsageMapError
     )
-    pool.destroy()
+    await pool.destroy()
   })
 
-  it('Simulate worker not found during decreaseWorkerRunningTasks', () => {
+  it('Simulate worker not found during decreaseWorkerRunningTasks', async () => {
     const pool = new StubPoolWithWorkerTasksUsageMapClear(
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js',
@@ -140,10 +141,10 @@ describe('Abstract pool test suite', () => {
     expect(() => pool.decreaseWorkerRunningTasks()).toThrowError(
       workerNotFoundInTasksUsageMapError
     )
-    pool.destroy()
+    await pool.destroy()
   })
 
-  it('Simulate worker not found during stepWorkerRunTasks', () => {
+  it('Simulate worker not found during stepWorkerRunTasks', async () => {
     const pool = new StubPoolWithWorkerTasksUsageMapClear(
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js',
@@ -156,10 +157,10 @@ describe('Abstract pool test suite', () => {
     expect(() => pool.stepWorkerRunTasks()).toThrowError(
       workerNotFoundInTasksUsageMapError
     )
-    pool.destroy()
+    await pool.destroy()
   })
 
-  it('Simulate worker not found during updateWorkerTasksRunTime with strategy not requiring it', () => {
+  it('Simulate worker not found during updateWorkerTasksRunTime with strategy not requiring it', async () => {
     const pool = new StubPoolWithWorkerTasksUsageMapClear(
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js',
@@ -170,10 +171,10 @@ describe('Abstract pool test suite', () => {
     // Simulate worker not found.
     pool.removeAllWorker()
     expect(() => pool.updateWorkerTasksRunTime()).not.toThrowError()
-    pool.destroy()
+    await pool.destroy()
   })
 
-  it('Simulate worker not found during updateWorkerTasksRunTime with strategy requiring it', () => {
+  it('Simulate worker not found during updateWorkerTasksRunTime with strategy requiring it', async () => {
     const pool = new StubPoolWithWorkerTasksUsageMapClear(
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js',
@@ -187,10 +188,10 @@ describe('Abstract pool test suite', () => {
     expect(() => pool.updateWorkerTasksRunTime()).toThrowError(
       workerNotFoundInTasksUsageMapError
     )
-    pool.destroy()
+    await pool.destroy()
   })
 
-  it('Verify that worker pool tasks usage are initialized', () => {
+  it('Verify that worker pool tasks usage are initialized', async () => {
     const pool = new FixedClusterPool(
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
@@ -202,7 +203,7 @@ describe('Abstract pool test suite', () => {
       expect(tasksUsage.runTime).toBe(0)
       expect(tasksUsage.avgRunTime).toBe(0)
     }
-    pool.destroy()
+    await pool.destroy()
   })
 
   it('Verify that worker pool tasks usage are computed', async () => {
@@ -229,7 +230,36 @@ describe('Abstract pool test suite', () => {
       expect(tasksUsage.runTime).toBeGreaterThanOrEqual(0)
       expect(tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
     }
-    pool.destroy()
+    await pool.destroy()
+  })
+
+  it('Verify that worker pool tasks usage are reset at worker choice strategy change', async () => {
+    const pool = new DynamicThreadPool(
+      numberOfWorkers,
+      numberOfWorkers,
+      './tests/worker-files/thread/testWorker.js'
+    )
+    const promises = []
+    for (let i = 0; i < numberOfWorkers * 2; i++) {
+      promises.push(pool.execute())
+    }
+    await Promise.all(promises)
+    for (const tasksUsage of pool.workersTasksUsage.values()) {
+      expect(tasksUsage).toBeDefined()
+      expect(tasksUsage.run).toBe(numberOfWorkers * 2)
+      expect(tasksUsage.running).toBe(0)
+      expect(tasksUsage.runTime).toBeGreaterThanOrEqual(0)
+      expect(tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
+    }
+    pool.setWorkerChoiceStrategy(WorkerChoiceStrategies.FAIR_SHARE)
+    for (const tasksUsage of pool.workersTasksUsage.values()) {
+      expect(tasksUsage).toBeDefined()
+      expect(tasksUsage.run).toBe(0)
+      expect(tasksUsage.running).toBe(0)
+      expect(tasksUsage.runTime).toBe(0)
+      expect(tasksUsage.avgRunTime).toBe(0)
+    }
+    await pool.destroy()
   })
 
   it("Verify that pool event emitter 'busy' event can register a callback", async () => {
@@ -247,6 +277,6 @@ describe('Abstract pool test suite', () => {
     // The `busy` event is triggered when the number of submitted tasks at once reach the number of fixed pool workers.
     // So in total numberOfWorkers + 1 times for a loop submitting up to numberOfWorkers * 2 tasks to the fixed pool.
     expect(poolBusy).toBe(numberOfWorkers + 1)
-    pool.destroy()
+    await pool.destroy()
   })
 })