X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Ffixed.test.js;h=9ee37ad83cb8981c01eae320c1968ecc025762f6;hb=08aaa20f1cc87dd022265b9bcb4439ddc58cbb3f;hp=42e13a9a83348f8b4d8c425f4f71ae32c77d6a7e;hpb=6cd5248f7b289828220cac63f8fe77d021c572e9;p=poolifier.git

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index 42e13a9a..9ee37ad8 100644
--- a/tests/pools/cluster/fixed.test.js
+++ b/tests/pools/cluster/fixed.test.js
@@ -11,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(
@@ -22,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(
@@ -38,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(
@@ -80,17 +80,18 @@ 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)
       }
     )
     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(poolReady).toBe(1)
+    await pool.destroy()
   })
 
   it("Verify that 'busy' event is emitted", async () => {
@@ -179,7 +180,7 @@ describe('Fixed cluster pool test suite', () => {
   it('Verify that error handling is working properly:sync', async () => {
     const data = { f: 10 }
     let taskError
-    errorPool.emitter.on(PoolEvents.taskError, (e) => {
+    errorPool.emitter.on(PoolEvents.taskError, e => {
       taskError = e
     })
     let inError
@@ -198,7 +199,7 @@ describe('Fixed cluster pool test suite', () => {
     })
     expect(
       errorPool.workerNodes.some(
-        (workerNode) => workerNode.usage.tasks.failed === 1
+        workerNode => workerNode.usage.tasks.failed === 1
       )
     ).toBe(true)
   })
@@ -206,7 +207,7 @@ describe('Fixed cluster pool test suite', () => {
   it('Verify that error handling is working properly:async', async () => {
     const data = { f: 10 }
     let taskError
-    asyncErrorPool.emitter.on(PoolEvents.taskError, (e) => {
+    asyncErrorPool.emitter.on(PoolEvents.taskError, e => {
       taskError = e
     })
     let inError
@@ -225,7 +226,7 @@ describe('Fixed cluster pool test suite', () => {
     })
     expect(
       asyncErrorPool.workerNodes.some(
-        (workerNode) => workerNode.usage.tasks.failed === 1
+        workerNode => workerNode.usage.tasks.failed === 1
       )
     ).toBe(true)
   })
@@ -245,42 +246,61 @@ describe('Fixed cluster pool test suite', () => {
     pool.emitter.on(PoolEvents.destroy, () => ++poolDestroy)
     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 () => {