X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=acd944067c4e134b5f0a2f0dd31fa57bebed3ccd;hb=9a0ded195223f6af15a5026d0de4882bdfa97832;hp=4c2c6952944902647177af13756cec63e6f04b0f;hpb=edc0cdb11d19cc5993ca98004a7dbbf49439acd8;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 4c2c6952..acd94406 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -2,6 +2,7 @@ const { expect } = require('expect')
 const { FixedThreadPool, PoolEvents } = require('../../../lib')
 const { TaskFunctions } = require('../../test-types')
 const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils')
+const { DEFAULT_TASK_NAME } = require('../../../lib/utils')
 
 describe('Fixed thread pool test suite', () => {
   const numberOfThreads = 6
@@ -10,7 +11,7 @@ describe('Fixed thread pool test suite', () => {
     numberOfThreads,
     './tests/worker-files/thread/testWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const queuePool = new FixedThreadPool(
@@ -21,7 +22,7 @@ describe('Fixed thread pool test suite', () => {
       tasksQueueOptions: {
         concurrency: tasksConcurrency
       },
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const emptyPool = new FixedThreadPool(
@@ -37,14 +38,14 @@ describe('Fixed thread pool test suite', () => {
     numberOfThreads,
     './tests/worker-files/thread/errorWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const asyncErrorPool = new FixedThreadPool(
     numberOfThreads,
     './tests/worker-files/thread/asyncErrorWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const asyncPool = new FixedThreadPool(
@@ -79,23 +80,28 @@ describe('Fixed thread pool test suite', () => {
   })
 
   it("Verify that 'ready' event is emitted", async () => {
-    const pool1 = new FixedThreadPool(
+    const pool = new FixedThreadPool(
       numberOfThreads,
       './tests/worker-files/thread/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 () => {
     const promises = new Set()
+    expect(pool.emitter.eventNames()).toStrictEqual([])
     let poolBusy = 0
     pool.emitter.on(PoolEvents.busy, () => ++poolBusy)
+    expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.busy])
     for (let i = 0; i < numberOfThreads * 2; i++) {
       promises.add(pool.execute())
     }
@@ -124,7 +130,9 @@ describe('Fixed thread pool test suite', () => {
       expect(workerNode.usage.tasks.maxQueued).toBe(
         maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency
       )
+      expect(workerNode.usage.tasks.stolen).toBe(0)
     }
+    expect(queuePool.info.executedTasks).toBe(0)
     expect(queuePool.info.executingTasks).toBe(
       numberOfThreads * queuePool.opts.tasksQueueOptions.concurrency
     )
@@ -137,15 +145,29 @@ describe('Fixed thread pool test suite', () => {
         (maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency)
     )
     expect(queuePool.info.backPressure).toBe(false)
+    expect(queuePool.info.stolenTasks).toBe(0)
     await Promise.all(promises)
     for (const workerNode of queuePool.workerNodes) {
-      expect(workerNode.usage.tasks.executing).toBe(0)
+      expect(workerNode.usage.tasks.executing).toBeGreaterThanOrEqual(0)
+      expect(workerNode.usage.tasks.executing).toBeLessThanOrEqual(
+        numberOfThreads * maxMultiplier
+      )
       expect(workerNode.usage.tasks.executed).toBe(maxMultiplier)
       expect(workerNode.usage.tasks.queued).toBe(0)
       expect(workerNode.usage.tasks.maxQueued).toBe(
         maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency
       )
+      expect(workerNode.usage.tasks.stolen).toBeGreaterThanOrEqual(0)
+      expect(workerNode.usage.tasks.stolen).toBeLessThanOrEqual(
+        numberOfThreads * maxMultiplier
+      )
     }
+    expect(queuePool.info.executedTasks).toBe(numberOfThreads * maxMultiplier)
+    expect(queuePool.info.backPressure).toBe(false)
+    expect(queuePool.info.stolenTasks).toBeGreaterThanOrEqual(0)
+    expect(queuePool.info.stolenTasks).toBeLessThanOrEqual(
+      numberOfThreads * maxMultiplier
+    )
   })
 
   it('Verify that is possible to have a worker that return undefined', async () => {
@@ -187,10 +209,12 @@ describe('Fixed thread 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)
@@ -203,23 +227,27 @@ describe('Fixed thread pool test suite', () => {
     expect(typeof inError.message === 'string').toBe(true)
     expect(inError.message).toBe('Error Message from ThreadWorker')
     expect(taskError).toStrictEqual({
-      name: 'default',
+      name: DEFAULT_TASK_NAME,
       message: new Error('Error Message from ThreadWorker'),
       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)
@@ -232,13 +260,13 @@ describe('Fixed thread pool test suite', () => {
     expect(typeof inError.message === 'string').toBe(true)
     expect(inError.message).toBe('Error Message from ThreadWorker:async')
     expect(taskError).toStrictEqual({
-      name: 'default',
+      name: DEFAULT_TASK_NAME,
       message: new Error('Error Message from ThreadWorker:async'),
       data
     })
     expect(
       asyncErrorPool.workerNodes.some(
-        (workerNode) => workerNode.usage.tasks.failed === 1
+        workerNode => workerNode.usage.tasks.failed === 1
       )
     ).toBe(true)
   })
@@ -254,41 +282,60 @@ describe('Fixed thread pool test suite', () => {
 
   it('Shutdown test', async () => {
     const exitPromise = waitWorkerEvents(pool, 'exit', numberOfThreads)
+    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(numberOfThreads)
     expect(poolDestroy).toBe(1)
   })
 
   it('Verify that thread pool options are checked', async () => {
     const workerFilePath = './tests/worker-files/thread/testWorker.js'
-    let pool1 = new FixedThreadPool(numberOfThreads, workerFilePath)
-    expect(pool1.opts.workerOptions).toBeUndefined()
-    await pool1.destroy()
-    pool1 = new FixedThreadPool(numberOfThreads, workerFilePath, {
+    let pool = new FixedThreadPool(numberOfThreads, workerFilePath)
+    expect(pool.opts.workerOptions).toBeUndefined()
+    await pool.destroy()
+    pool = new FixedThreadPool(numberOfThreads, workerFilePath, {
       workerOptions: {
         env: { TEST: 'test' },
         name: 'test'
       }
     })
-    expect(pool1.opts.workerOptions).toStrictEqual({
+    expect(pool.opts.workerOptions).toStrictEqual({
       env: { TEST: 'test' },
       name: 'test'
     })
-    await pool1.destroy()
+    await pool.destroy()
   })
 
   it('Should work even without opts in input', async () => {
-    const pool1 = new FixedThreadPool(
-      numberOfThreads,
-      './tests/worker-files/thread/testWorker.js'
-    )
-    const res = await pool1.execute()
+    const workerFilePath = './tests/worker-files/thread/testWorker.js'
+    const pool = new FixedThreadPool(numberOfThreads, 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/thread/testWorker.js'
+    const pool = new FixedThreadPool(numberOfThreads, workerFilePath)
+    const workerNodeKey = 0
+    let exitEvent = 0
+    pool.workerNodes[workerNodeKey].worker.on('exit', () => {
+      ++exitEvent
+    })
+    await expect(pool.destroyWorkerNode(workerNodeKey)).resolves.toBeUndefined()
+    expect(exitEvent).toBe(1)
+    expect(pool.workerNodes.length).toBe(numberOfThreads - 1)
+    await pool.destroy()
   })
 
   it('Verify that a pool with zero worker fails', async () => {