X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Ffixed.test.js;h=2ef709c1d0fc71fa3d6da9af508d8afa3859d5cf;hb=a38092895499e2e6e9f8c45bd12bdef3849897ff;hp=0eb21d0716c32ac19bdb321a24253a31ed0eb44a;hpb=8d3782faec08afef3370aaaadd06de2c1cb270fd;p=poolifier.git

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index 0eb21d07..2ef709c1 100644
--- a/tests/pools/cluster/fixed.test.js
+++ b/tests/pools/cluster/fixed.test.js
@@ -1,8 +1,7 @@
-const expect = require('expect')
+const { expect } = require('expect')
 const { FixedClusterPool } = require('../../../lib/index')
 const TestUtils = require('../../test-utils')
 const numberOfWorkers = 10
-const maxTasks = 500
 const pool = new FixedClusterPool(
   numberOfWorkers,
   './tests/worker-files/cluster/testWorker.js',
@@ -12,7 +11,8 @@ const pool = new FixedClusterPool(
 )
 const emptyPool = new FixedClusterPool(
   1,
-  './tests/worker-files/cluster/emptyWorker.js'
+  './tests/worker-files/cluster/emptyWorker.js',
+  { exitHandler: () => console.log('empty pool worker exited') }
 )
 const echoPool = new FixedClusterPool(
   1,
@@ -29,15 +29,12 @@ const asyncErrorPool = new FixedClusterPool(
   1,
   './tests/worker-files/cluster/asyncErrorWorker.js',
   {
-    onlineHandler: () => console.log('worker is online')
+    errorHandler: e => console.error(e)
   }
 )
 const asyncPool = new FixedClusterPool(
   1,
-  './tests/worker-files/cluster/asyncWorker.js',
-  {
-    maxTasks: maxTasks
-  }
+  './tests/worker-files/cluster/asyncWorker.js'
 )
 
 describe('Fixed cluster pool test suite', () => {
@@ -70,6 +67,18 @@ describe('Fixed cluster pool test suite', () => {
     expect(result).toBeFalsy()
   })
 
+  it('Verify that busy event is emitted', async () => {
+    const promises = []
+    let poolBusy = 0
+    pool.emitter.on('busy', () => poolBusy++)
+    for (let i = 0; i < numberOfWorkers * 2; i++) {
+      promises.push(pool.execute({ test: 'test' }))
+    }
+    // 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)
+  })
+
   it('Verify that is possible to have a worker that return undefined', async () => {
     const result = await emptyPool.execute()
     expect(result).toBeFalsy()
@@ -91,7 +100,7 @@ describe('Fixed cluster pool test suite', () => {
       inError = e
     }
     expect(inError).toBeDefined()
-    expect(typeof inError === 'string').toBeTruthy()
+    expect(typeof inError === 'string').toBe(true)
     expect(inError).toBe('Error Message from ClusterWorker')
   })
 
@@ -104,7 +113,7 @@ describe('Fixed cluster pool test suite', () => {
       inError = e
     }
     expect(inError).toBeDefined()
-    expect(typeof inError === 'string').toBeTruthy()
+    expect(typeof inError === 'string').toBe(true)
     expect(inError).toBe('Error Message from ClusterWorker:async')
   })
 
@@ -118,16 +127,11 @@ describe('Fixed cluster pool test suite', () => {
     expect(usedTime).toBeGreaterThanOrEqual(2000)
   })
 
-  it('Verify that maxTasks is set properly', async () => {
-    const worker = asyncPool.chooseWorker()
-    expect(worker.getMaxListeners()).toBe(maxTasks)
-  })
-
   it('Shutdown test', async () => {
     const exitPromise = TestUtils.waitExits(pool, numberOfWorkers)
     await pool.destroy()
-    const res = await exitPromise
-    expect(res).toBe(numberOfWorkers)
+    const numberOfExitEvents = await exitPromise
+    expect(numberOfExitEvents).toBe(numberOfWorkers)
   })
 
   it('Should work even without opts in input', async () => {