X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Ffixed.test.js;h=7048bb7937946108777aa8faa65fe569031bc98e;hb=8620fb25c8b80fc7ef55d76e19781181571c5502;hp=d22f697a5d3893863c5c60798cd8d77a7dd7e451;hpb=45dbbb14328a173cad05ddcf21b5acf7f6460bb8;p=poolifier.git

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index d22f697a..7048bb79 100644
--- a/tests/pools/cluster/fixed.test.js
+++ b/tests/pools/cluster/fixed.test.js
@@ -1,45 +1,52 @@
 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/cluster/testWorker.js',
+  './tests/worker-files/cluster/testWorker.js',
   {
-    errorHandler: e => console.error(e),
-    onlineHandler: () => console.log('worker is online')
+    errorHandler: e => console.error(e)
   }
 )
 const emptyPool = new FixedClusterPool(
   1,
-  './tests/worker/cluster/emptyWorker.js'
+  './tests/worker-files/cluster/emptyWorker.js',
+  { exitHandler: () => console.log('empty pool worker exited') }
+)
+const echoPool = new FixedClusterPool(
+  1,
+  './tests/worker-files/cluster/echoWorker.js'
 )
-const echoPool = new FixedClusterPool(1, './tests/worker/cluster/echoWorker.js')
 const errorPool = new FixedClusterPool(
   1,
-  './tests/worker/cluster/errorWorker.js',
+  './tests/worker-files/cluster/errorWorker.js',
   {
-    errorHandler: e => console.error(e),
-    onlineHandler: () => console.log('worker is online')
+    errorHandler: e => console.error(e)
   }
 )
-
 const asyncErrorPool = new FixedClusterPool(
   1,
-  './tests/worker/cluster/asyncErrorWorker.js',
+  './tests/worker-files/cluster/asyncErrorWorker.js',
   {
-    onlineHandler: () => console.log('worker is online')
+    errorHandler: e => console.error(e)
   }
 )
 const asyncPool = new FixedClusterPool(
   1,
-  './tests/worker/cluster/asyncWorker.js',
-  {
-    maxTasks: maxTasks
-  }
+  './tests/worker-files/cluster/asyncWorker.js'
 )
 
-describe('Fixed cluster pool test suite ', () => {
+describe('Fixed cluster pool test suite', () => {
+  after('Destroy all pools', async () => {
+    // We need to clean up the resources after our test
+    await echoPool.destroy()
+    await asyncPool.destroy()
+    await errorPool.destroy()
+    await asyncErrorPool.destroy()
+    await emptyPool.destroy()
+  })
+
   it('Choose worker round robin test', async () => {
     const results = new Set()
     for (let i = 0; i < numberOfWorkers; i++) {
@@ -60,6 +67,16 @@ 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' }))
+    }
+    expect(poolBusy).toBe(numberOfWorkers)
+  })
+
   it('Verify that is possible to have a worker that return undefined', async () => {
     const result = await emptyPool.execute()
     expect(result).toBeFalsy()
@@ -81,7 +98,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')
   })
 
@@ -94,7 +111,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')
   })
 
@@ -108,41 +125,28 @@ 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 () => {
-    let closedWorkers = 0
-    pool.workers.forEach(w => {
-      w.on('exit', () => {
-        closedWorkers++
-      })
-    })
+    const exitPromise = TestUtils.waitExits(pool, numberOfWorkers)
     await pool.destroy()
-    await new Promise(resolve => setTimeout(resolve, 200))
-    expect(closedWorkers).toBe(numberOfWorkers)
-  })
-
-  it('Validations test', () => {
-    let error
-    try {
-      const pool1 = new FixedClusterPool()
-      console.log(pool1)
-    } catch (e) {
-      error = e
-    }
-    expect(error).toBeTruthy()
-    expect(error.message).toBeTruthy()
+    const res = await exitPromise
+    expect(res).toBe(numberOfWorkers)
   })
 
   it('Should work even without opts in input', async () => {
     const pool1 = new FixedClusterPool(
       1,
-      './tests/worker/cluster/testWorker.js'
+      './tests/worker-files/cluster/testWorker.js'
     )
     const res = await pool1.execute({ test: 'test' })
     expect(res).toBeFalsy()
+    // We need to clean up the resources after our test
+    await pool1.destroy()
+  })
+
+  it('Verify that a pool with zero worker fails', async () => {
+    expect(
+      () =>
+        new FixedClusterPool(0, './tests/worker-files/cluster/testWorker.js')
+    ).toThrowError(new Error('Cannot instantiate a fixed pool with no worker'))
   })
 })