X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Ffixed.test.js;h=0994e9e903b247eb15f6eb2f8418afb102c36739;hb=c726f66c5c7ce127bfd2010a60fa07761f21cbd1;hp=85eb6a0affcd0a3c05be2b9923a438afaa8446b0;hpb=56d1167079ce8b4a043a8d750389f0d00ecccbad;p=poolifier.git

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index 85eb6a0a..0994e9e9 100644
--- a/tests/pools/cluster/fixed.test.js
+++ b/tests/pools/cluster/fixed.test.js
@@ -2,6 +2,7 @@ const { expect } = require('expect')
 const { FixedClusterPool, PoolEvents } = require('../../../lib')
 const { TaskFunctions } = require('../../test-types')
 const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils')
+const { DEFAULT_TASK_NAME } = require('../../../lib/utils')
 
 describe('Fixed cluster pool test suite', () => {
   const numberOfWorkers = 8
@@ -10,7 +11,7 @@ describe('Fixed cluster pool test suite', () => {
     numberOfWorkers,
     './tests/worker-files/cluster/testWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const queuePool = new FixedClusterPool(
@@ -21,7 +22,7 @@ describe('Fixed cluster pool test suite', () => {
       tasksQueueOptions: {
         concurrency: tasksConcurrency
       },
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const emptyPool = new FixedClusterPool(
@@ -37,14 +38,14 @@ describe('Fixed cluster pool test suite', () => {
     numberOfWorkers,
     './tests/worker-files/cluster/errorWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const asyncErrorPool = new FixedClusterPool(
     numberOfWorkers,
     './tests/worker-files/cluster/asyncErrorWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const asyncPool = new FixedClusterPool(
@@ -79,23 +80,28 @@ describe('Fixed cluster pool test suite', () => {
   })
 
   it("Verify that 'ready' event is emitted", async () => {
-    const pool1 = new FixedClusterPool(
+    const pool = new FixedClusterPool(
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js',
       {
-        errorHandler: (e) => console.error(e)
+        errorHandler: e => console.error(e)
       }
     )
+    expect(pool.emitter.eventNames()).toStrictEqual([])
     let poolReady = 0
-    pool1.emitter.on(PoolEvents.ready, () => ++poolReady)
-    await waitPoolEvents(pool1, PoolEvents.ready, 1)
+    pool.emitter.on(PoolEvents.ready, () => ++poolReady)
+    await waitPoolEvents(pool, PoolEvents.ready, 1)
+    expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.ready])
     expect(poolReady).toBe(1)
+    await pool.destroy()
   })
 
   it("Verify that 'busy' event is emitted", async () => {
+    expect(pool.emitter.eventNames()).toStrictEqual([])
     const promises = new Set()
     let poolBusy = 0
     pool.emitter.on(PoolEvents.busy, () => ++poolBusy)
+    expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.busy])
     for (let i = 0; i < numberOfWorkers * 2; i++) {
       promises.add(pool.execute())
     }
@@ -177,10 +183,12 @@ describe('Fixed cluster pool test suite', () => {
 
   it('Verify that error handling is working properly:sync', async () => {
     const data = { f: 10 }
+    expect(errorPool.emitter.eventNames()).toStrictEqual([])
     let taskError
-    errorPool.emitter.on(PoolEvents.taskError, (e) => {
+    errorPool.emitter.on(PoolEvents.taskError, e => {
       taskError = e
     })
+    expect(errorPool.emitter.eventNames()).toStrictEqual([PoolEvents.taskError])
     let inError
     try {
       await errorPool.execute(data)
@@ -191,23 +199,27 @@ describe('Fixed cluster pool test suite', () => {
     expect(typeof inError === 'string').toBe(true)
     expect(inError).toBe('Error Message from ClusterWorker')
     expect(taskError).toStrictEqual({
-      name: 'default',
+      name: DEFAULT_TASK_NAME,
       message: 'Error Message from ClusterWorker',
       data
     })
     expect(
       errorPool.workerNodes.some(
-        (workerNode) => workerNode.usage.tasks.failed === 1
+        workerNode => workerNode.usage.tasks.failed === 1
       )
     ).toBe(true)
   })
 
   it('Verify that error handling is working properly:async', async () => {
     const data = { f: 10 }
+    expect(asyncErrorPool.emitter.eventNames()).toStrictEqual([])
     let taskError
-    asyncErrorPool.emitter.on(PoolEvents.taskError, (e) => {
+    asyncErrorPool.emitter.on(PoolEvents.taskError, e => {
       taskError = e
     })
+    expect(asyncErrorPool.emitter.eventNames()).toStrictEqual([
+      PoolEvents.taskError
+    ])
     let inError
     try {
       await asyncErrorPool.execute(data)
@@ -218,13 +230,13 @@ describe('Fixed cluster pool test suite', () => {
     expect(typeof inError === 'string').toBe(true)
     expect(inError).toBe('Error Message from ClusterWorker:async')
     expect(taskError).toStrictEqual({
-      name: 'default',
+      name: DEFAULT_TASK_NAME,
       message: 'Error Message from ClusterWorker:async',
       data
     })
     expect(
       asyncErrorPool.workerNodes.some(
-        (workerNode) => workerNode.usage.tasks.failed === 1
+        workerNode => workerNode.usage.tasks.failed === 1
       )
     ).toBe(true)
   })
@@ -240,46 +252,70 @@ describe('Fixed cluster pool test suite', () => {
 
   it('Shutdown test', async () => {
     const exitPromise = waitWorkerEvents(pool, 'exit', numberOfWorkers)
+    expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.busy])
     let poolDestroy = 0
     pool.emitter.on(PoolEvents.destroy, () => ++poolDestroy)
+    expect(pool.emitter.eventNames()).toStrictEqual([
+      PoolEvents.busy,
+      PoolEvents.destroy
+    ])
     await pool.destroy()
     const numberOfExitEvents = await exitPromise
+    expect(pool.started).toBe(false)
+    expect(pool.workerNodes.length).toBe(0)
     expect(numberOfExitEvents).toBe(numberOfWorkers)
     expect(poolDestroy).toBe(1)
   })
 
   it('Verify that cluster pool options are checked', async () => {
     const workerFilePath = './tests/worker-files/cluster/testWorker.js'
-    let pool1 = new FixedClusterPool(numberOfWorkers, workerFilePath)
-    expect(pool1.opts.env).toBeUndefined()
-    expect(pool1.opts.settings).toBeUndefined()
-    await pool1.destroy()
-    pool1 = new FixedClusterPool(numberOfWorkers, workerFilePath, {
+    let pool = new FixedClusterPool(numberOfWorkers, workerFilePath)
+    expect(pool.opts.env).toBeUndefined()
+    expect(pool.opts.settings).toBeUndefined()
+    await pool.destroy()
+    pool = new FixedClusterPool(numberOfWorkers, workerFilePath, {
       env: { TEST: 'test' },
       settings: { args: ['--use', 'http'], silent: true }
     })
-    expect(pool1.opts.env).toStrictEqual({ TEST: 'test' })
-    expect(pool1.opts.settings).toStrictEqual({
+    expect(pool.opts.env).toStrictEqual({ TEST: 'test' })
+    expect(pool.opts.settings).toStrictEqual({
       args: ['--use', 'http'],
       silent: true
     })
-    expect({ ...pool1.opts.settings, exec: workerFilePath }).toStrictEqual({
+    expect({ ...pool.opts.settings, exec: workerFilePath }).toStrictEqual({
       args: ['--use', 'http'],
       silent: true,
       exec: workerFilePath
     })
-    await pool1.destroy()
+    await pool.destroy()
   })
 
   it('Should work even without opts in input', async () => {
-    const pool1 = new FixedClusterPool(
-      numberOfWorkers,
-      './tests/worker-files/cluster/testWorker.js'
-    )
-    const res = await pool1.execute()
+    const workerFilePath = './tests/worker-files/cluster/testWorker.js'
+    const pool = new FixedClusterPool(numberOfWorkers, workerFilePath)
+    const res = await pool.execute()
     expect(res).toStrictEqual({ ok: 1 })
     // We need to clean up the resources after our test
-    await pool1.destroy()
+    await pool.destroy()
+  })
+
+  it('Verify destroyWorkerNode()', async () => {
+    const workerFilePath = './tests/worker-files/cluster/testWorker.js'
+    const pool = new FixedClusterPool(numberOfWorkers, workerFilePath)
+    const workerNodeKey = 0
+    let disconnectEvent = 0
+    pool.workerNodes[workerNodeKey].worker.on('disconnect', () => {
+      ++disconnectEvent
+    })
+    let exitEvent = 0
+    pool.workerNodes[workerNodeKey].worker.on('exit', () => {
+      ++exitEvent
+    })
+    await expect(pool.destroyWorkerNode(workerNodeKey)).resolves.toBeUndefined()
+    expect(disconnectEvent).toBe(1)
+    expect(exitEvent).toBe(1)
+    expect(pool.workerNodes.length).toBe(numberOfWorkers - 1)
+    await pool.destroy()
   })
 
   it('Verify that a pool with zero worker fails', async () => {