X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=f210d52016cac5115efff53991e465aebdd77621;hb=9c16fb4b40484a75e534e055d838f22ac0343009;hp=5dd97665f6177767e1502da8825b4200567e570e;hpb=fe2dcd443af649ee75e8e66a3cff4174f072b015;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 5dd97665..f210d520 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -96,13 +96,13 @@ describe('Fixed thread pool test suite', () => {
     }
     expect(promises.size).toBe(numberOfThreads * maxMultiplier)
     for (const workerNode of queuePool.workerNodes) {
-      expect(workerNode.tasksUsage.running).toBeLessThanOrEqual(
+      expect(workerNode.workerUsage.tasks.executing).toBeLessThanOrEqual(
         queuePool.opts.tasksQueueOptions.concurrency
       )
-      expect(workerNode.tasksUsage.ran).toBe(0)
-      expect(workerNode.tasksQueue.size).toBeGreaterThan(0)
+      expect(workerNode.workerUsage.tasks.executed).toBe(0)
+      expect(workerNode.workerUsage.tasks.queued).toBeGreaterThan(0)
     }
-    expect(queuePool.info.runningTasks).toBe(numberOfThreads)
+    expect(queuePool.info.executingTasks).toBe(numberOfThreads)
     expect(queuePool.info.queuedTasks).toBe(
       numberOfThreads * maxMultiplier - numberOfThreads
     )
@@ -111,10 +111,12 @@ describe('Fixed thread pool test suite', () => {
     )
     await Promise.all(promises)
     for (const workerNode of queuePool.workerNodes) {
-      expect(workerNode.tasksUsage.running).toBe(0)
-      expect(workerNode.tasksUsage.ran).toBeGreaterThan(0)
-      expect(workerNode.tasksUsage.ran).toBeLessThanOrEqual(maxMultiplier)
-      expect(workerNode.tasksQueue.size).toBe(0)
+      expect(workerNode.workerUsage.tasks.executing).toBe(0)
+      expect(workerNode.workerUsage.tasks.executed).toBeGreaterThan(0)
+      expect(workerNode.workerUsage.tasks.executed).toBeLessThanOrEqual(
+        maxMultiplier
+      )
+      expect(workerNode.workerUsage.tasks.queued).toBe(0)
     }
   })
 
@@ -147,12 +149,12 @@ describe('Fixed thread pool test suite', () => {
     expect(typeof inError.message === 'string').toBe(true)
     expect(inError.message).toBe('Error Message from ThreadWorker')
     expect(taskError).toStrictEqual({
-      error: new Error('Error Message from ThreadWorker'),
-      errorData: data
+      message: new Error('Error Message from ThreadWorker'),
+      data
     })
     expect(
       errorPool.workerNodes.some(
-        workerNode => workerNode.tasksUsage.error === 1
+        workerNode => workerNode.workerUsage.tasks.failed === 1
       )
     ).toBe(true)
   })
@@ -175,12 +177,12 @@ 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({
-      error: new Error('Error Message from ThreadWorker:async'),
-      errorData: data
+      message: new Error('Error Message from ThreadWorker:async'),
+      data
     })
     expect(
       asyncErrorPool.workerNodes.some(
-        workerNode => workerNode.tasksUsage.error === 1
+        workerNode => workerNode.workerUsage.tasks.failed === 1
       )
     ).toBe(true)
   })
@@ -195,12 +197,34 @@ describe('Fixed thread pool test suite', () => {
   })
 
   it('Shutdown test', async () => {
-    const exitPromise = TestUtils.waitWorkerExits(pool, numberOfThreads)
+    const exitPromise = TestUtils.waitWorkerEvents(
+      pool,
+      'exit',
+      numberOfThreads
+    )
     await pool.destroy()
     const numberOfExitEvents = await exitPromise
     expect(numberOfExitEvents).toBe(numberOfThreads)
   })
 
+  it('Verify that thread pool options are checked', async () => {
+    const workerFilePath = './tests/worker-files/cluster/testWorker.js'
+    let pool1 = new FixedThreadPool(numberOfThreads, workerFilePath)
+    expect(pool1.opts.workerOptions).toBeUndefined()
+    await pool1.destroy()
+    pool1 = new FixedThreadPool(numberOfThreads, workerFilePath, {
+      workerOptions: {
+        env: { TEST: 'test' },
+        name: 'test'
+      }
+    })
+    expect(pool1.opts.workerOptions).toStrictEqual({
+      env: { TEST: 'test' },
+      name: 'test'
+    })
+    await pool1.destroy()
+  })
+
   it('Should work even without opts in input', async () => {
     const pool1 = new FixedThreadPool(
       numberOfThreads,