X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Fdynamic.test.js;h=7a834ca237d64df507036ee797b7c6e315d140fe;hb=ffcbbad84f63b8a77f2b1a08f82deef5430f646e;hp=bd7a067274d2862d9e1be92b748c0356e324ea0a;hpb=6db75ad932064c1415ff6f03645929530209a5fe;p=poolifier.git

diff --git a/tests/pools/cluster/dynamic.test.js b/tests/pools/cluster/dynamic.test.js
index bd7a0672..7a834ca2 100644
--- a/tests/pools/cluster/dynamic.test.js
+++ b/tests/pools/cluster/dynamic.test.js
@@ -1,19 +1,20 @@
 const { expect } = require('expect')
 const { DynamicClusterPool } = require('../../../lib/index')
-const WorkerFunctions = require('../../test-types')
+const { WorkerFunctions } = require('../../test-types')
 const TestUtils = require('../../test-utils')
-const min = 1
-const max = 3
-const pool = new DynamicClusterPool(
-  min,
-  max,
-  './tests/worker-files/cluster/testWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
 
 describe('Dynamic cluster pool test suite', () => {
+  const min = 1
+  const max = 3
+  const pool = new DynamicClusterPool(
+    min,
+    max,
+    './tests/worker-files/cluster/testWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+
   it('Verify that the function is executed in a worker cluster', async () => {
     let result = await pool.execute({
       function: WorkerFunctions.fibonacci
@@ -26,14 +27,13 @@ describe('Dynamic cluster pool test suite', () => {
   })
 
   it('Verify that new workers are created when required, max size is not exceeded and that after a while new workers will die', async () => {
-    const promises = []
     let poolBusy = 0
-    pool.emitter.on('busy', () => poolBusy++)
+    pool.emitter.on('busy', () => ++poolBusy)
     for (let i = 0; i < max * 2; i++) {
-      promises.push(pool.execute())
+      pool.execute()
     }
-    expect(pool.workers.length).toBeLessThanOrEqual(max)
-    expect(pool.workers.length).toBeGreaterThan(min)
+    expect(pool.workers.size).toBeLessThanOrEqual(max)
+    expect(pool.workers.size).toBeGreaterThan(min)
     // The `busy` event is triggered when the number of submitted tasks at once reach the max number of workers in the dynamic pool.
     // So in total numberOfWorkers + 1 times for a loop submitting up to numberOfWorkers * 2 tasks to the dynamic pool.
     expect(poolBusy).toBe(max + 1)
@@ -42,19 +42,19 @@ describe('Dynamic cluster pool test suite', () => {
   })
 
   it('Verify scale worker up and down is working', async () => {
-    expect(pool.workers.length).toBe(min)
+    expect(pool.workers.size).toBe(min)
     for (let i = 0; i < max * 10; i++) {
       pool.execute()
     }
-    expect(pool.workers.length).toBeGreaterThan(min)
+    expect(pool.workers.size).toBeGreaterThan(min)
     await TestUtils.waitExits(pool, max - min)
-    expect(pool.workers.length).toBe(min)
+    expect(pool.workers.size).toBe(min)
     for (let i = 0; i < max * 10; i++) {
       pool.execute()
     }
-    expect(pool.workers.length).toBeGreaterThan(min)
+    expect(pool.workers.size).toBeGreaterThan(min)
     await TestUtils.waitExits(pool, max - min)
-    expect(pool.workers.length).toBe(min)
+    expect(pool.workers.size).toBe(min)
   })
 
   it('Shutdown test', async () => {
@@ -72,8 +72,8 @@ describe('Dynamic cluster pool test suite', () => {
 
   it('Should work even without opts in input', async () => {
     const pool1 = new DynamicClusterPool(
-      1,
-      1,
+      min,
+      max,
       './tests/worker-files/cluster/testWorker.js'
     )
     const result = await pool1.execute()
@@ -93,14 +93,14 @@ describe('Dynamic cluster pool test suite', () => {
         exitHandler: () => console.log('long running worker exited')
       }
     )
-    expect(longRunningPool.workers.length).toBe(min)
+    expect(longRunningPool.workers.size).toBe(min)
     for (let i = 0; i < max * 10; i++) {
       longRunningPool.execute()
     }
-    expect(longRunningPool.workers.length).toBe(max)
+    expect(longRunningPool.workers.size).toBe(max)
     await TestUtils.waitExits(longRunningPool, max - min)
     // Here we expect the workers to be at the max size since that the task is still running
-    expect(longRunningPool.workers.length).toBe(min)
+    expect(longRunningPool.workers.size).toBe(min)
     // We need to clean up the resources after our test
     await longRunningPool.destroy()
   })
@@ -116,14 +116,14 @@ describe('Dynamic cluster pool test suite', () => {
         exitHandler: () => console.log('long running worker exited')
       }
     )
-    expect(longRunningPool.workers.length).toBe(min)
+    expect(longRunningPool.workers.size).toBe(min)
     for (let i = 0; i < max * 10; i++) {
       longRunningPool.execute()
     }
-    expect(longRunningPool.workers.length).toBe(max)
+    expect(longRunningPool.workers.size).toBe(max)
     await TestUtils.sleep(1500)
     // Here we expect the workers to be at the max size since that the task is still running
-    expect(longRunningPool.workers.length).toBe(max)
+    expect(longRunningPool.workers.size).toBe(max)
     // We need to clean up the resources after our test
     await longRunningPool.destroy()
   })