X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Fdynamic.test.js;h=b1201ea587c9803dafd33e7e974b800c3d218afc;hb=82429ded15eaf9ba1aea91e73c2326c24d33d6ff;hp=2cff475f99cd6b0368b216a9f45931fd7050fed6;hpb=8bc7762018845abb73680eb1bbd65802b002ea08;p=poolifier.git

diff --git a/tests/pools/cluster/dynamic.test.js b/tests/pools/cluster/dynamic.test.js
index 2cff475f..b1201ea5 100644
--- a/tests/pools/cluster/dynamic.test.js
+++ b/tests/pools/cluster/dynamic.test.js
@@ -1,4 +1,4 @@
-const expect = require('expect')
+const { expect } = require('expect')
 const { DynamicClusterPool } = require('../../../lib/index')
 const TestUtils = require('../../test-utils')
 const min = 1
@@ -12,7 +12,7 @@ const pool = new DynamicClusterPool(
   }
 )
 
-describe('Dynamic cluster pool test suite ', () => {
+describe('Dynamic cluster pool test suite', () => {
   it('Verify that the function is executed in a worker cluster', async () => {
     const result = await pool.execute({ test: 'test' })
     expect(result).toBeDefined()
@@ -21,14 +21,16 @@ 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 fullPool = 0
-    pool.emitter.on('FullPool', () => fullPool++)
+    let poolBusy = 0
+    pool.emitter.on('busy', () => poolBusy++)
     for (let i = 0; i < max * 2; i++) {
       promises.push(pool.execute({ test: 'test' }))
     }
     expect(pool.workers.length).toBeLessThanOrEqual(max)
     expect(pool.workers.length).toBeGreaterThan(min)
-    expect(fullPool > 1).toBeTruthy()
+    // 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)
     const numberOfExitEvents = await TestUtils.waitExits(pool, max - min)
     expect(numberOfExitEvents).toBe(max - min)
   })
@@ -56,6 +58,12 @@ describe('Dynamic cluster pool test suite ', () => {
     expect(res).toBe(min)
   })
 
+  it('Validation of inputs test', () => {
+    expect(() => new DynamicClusterPool(min)).toThrowError(
+      new Error('Please specify a file with a worker implementation')
+    )
+  })
+
   it('Should work even without opts in input', async () => {
     const pool1 = new DynamicClusterPool(
       1,
@@ -63,6 +71,7 @@ describe('Dynamic cluster pool test suite ', () => {
       './tests/worker-files/cluster/testWorker.js'
     )
     const result = await pool1.execute({ test: 'test' })
+    expect(result).toBeDefined()
     expect(result).toBeFalsy()
     // We need to clean up the resources after our test
     await pool1.destroy()
@@ -72,7 +81,12 @@ describe('Dynamic cluster pool test suite ', () => {
     const longRunningPool = new DynamicClusterPool(
       min,
       max,
-      './tests/worker-files/cluster/longRunningWorkerHardBehavior.js'
+      './tests/worker-files/cluster/longRunningWorkerHardBehavior.js',
+      {
+        errorHandler: e => console.error(e),
+        onlineHandler: () => console.log('long running worker is online'),
+        exitHandler: () => console.log('long running worker exited')
+      }
     )
     expect(longRunningPool.workers.length).toBe(min)
     for (let i = 0; i < max * 10; i++) {
@@ -90,7 +104,12 @@ describe('Dynamic cluster pool test suite ', () => {
     const longRunningPool = new DynamicClusterPool(
       min,
       max,
-      './tests/worker-files/cluster/longRunningWorkerSoftBehavior.js'
+      './tests/worker-files/cluster/longRunningWorkerSoftBehavior.js',
+      {
+        errorHandler: e => console.error(e),
+        onlineHandler: () => console.log('long running worker is online'),
+        exitHandler: () => console.log('long running worker exited')
+      }
     )
     expect(longRunningPool.workers.length).toBe(min)
     for (let i = 0; i < max * 10; i++) {
@@ -103,4 +122,15 @@ describe('Dynamic cluster pool test suite ', () => {
     // We need to clean up the resources after our test
     await longRunningPool.destroy()
   })
+
+  it('Verify that a pool with zero worker can be instantiated', async () => {
+    const pool = new DynamicClusterPool(
+      0,
+      max,
+      './tests/worker-files/cluster/testWorker.js'
+    )
+    expect(pool).toBeInstanceOf(DynamicClusterPool)
+    // We need to clean up the resources after our test
+    await pool.destroy()
+  })
 })