X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fcluster%2Ffixed.test.js;h=59f76802bb97a109795e92702e470c6a670543e0;hb=4d8bf9e40e07bd233be4494fda4e4270fdd8a355;hp=2a0a8e2e70f02e15839d89d972d433254ab744e6;hpb=a61a07243eee5cc54e7cf0d8e231202781f73f30;p=poolifier.git

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index 2a0a8e2e..59f76802 100644
--- a/tests/pools/cluster/fixed.test.js
+++ b/tests/pools/cluster/fixed.test.js
@@ -1,43 +1,56 @@
 const { expect } = require('expect')
-const { FixedClusterPool } = require('../../../lib/index')
+const { FixedClusterPool, PoolEvents } = require('../../../lib')
+const { WorkerFunctions } = require('../../test-types')
 const TestUtils = require('../../test-utils')
-const numberOfWorkers = 10
-const pool = new FixedClusterPool(
-  numberOfWorkers,
-  './tests/worker-files/cluster/testWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
-const emptyPool = new FixedClusterPool(
-  1,
-  './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 errorPool = new FixedClusterPool(
-  1,
-  './tests/worker-files/cluster/errorWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
-const asyncErrorPool = new FixedClusterPool(
-  1,
-  './tests/worker-files/cluster/asyncErrorWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
-const asyncPool = new FixedClusterPool(
-  1,
-  './tests/worker-files/cluster/asyncWorker.js'
-)
 
 describe('Fixed cluster pool test suite', () => {
+  const numberOfWorkers = 6
+  const pool = new FixedClusterPool(
+    numberOfWorkers,
+    './tests/worker-files/cluster/testWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const queuePool = new FixedClusterPool(
+    numberOfWorkers,
+    './tests/worker-files/cluster/testWorker.js',
+    {
+      enableTasksQueue: true,
+      tasksQueueOptions: {
+        concurrency: 2
+      },
+      errorHandler: e => console.error(e)
+    }
+  )
+  const emptyPool = new FixedClusterPool(
+    numberOfWorkers,
+    './tests/worker-files/cluster/emptyWorker.js',
+    { exitHandler: () => console.log('empty pool worker exited') }
+  )
+  const echoPool = new FixedClusterPool(
+    numberOfWorkers,
+    './tests/worker-files/cluster/echoWorker.js'
+  )
+  const errorPool = new FixedClusterPool(
+    numberOfWorkers,
+    './tests/worker-files/cluster/errorWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const asyncErrorPool = new FixedClusterPool(
+    numberOfWorkers,
+    './tests/worker-files/cluster/asyncErrorWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const asyncPool = new FixedClusterPool(
+    numberOfWorkers,
+    './tests/worker-files/cluster/asyncWorker.js'
+  )
+
   after('Destroy all pools', async () => {
     // We need to clean up the resources after our test
     await echoPool.destroy()
@@ -45,50 +58,72 @@ describe('Fixed cluster pool test suite', () => {
     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++) {
-      results.add(pool.chooseWorker().id)
-    }
-    expect(results.size).toBe(numberOfWorkers)
+    await queuePool.destroy()
   })
 
   it('Verify that the function is executed in a worker cluster', async () => {
-    const result = await pool.execute({ test: 'test' })
-    expect(result).toBeDefined()
-    expect(result).toBeFalsy()
+    let result = await pool.execute({
+      function: WorkerFunctions.fibonacci
+    })
+    expect(result).toBe(false)
+    result = await pool.execute({
+      function: WorkerFunctions.factorial
+    })
+    expect(result).toBe(false)
   })
 
-  it('Verify that is possible to invoke the execute method without input', async () => {
+  it('Verify that is possible to invoke the execute() method without input', async () => {
     const result = await pool.execute()
-    expect(result).toBeDefined()
-    expect(result).toBeFalsy()
+    expect(result).toBe(false)
   })
 
-  it('Verify that busy event is emitted', async () => {
-    const promises = []
+  it("Verify that 'busy' event is emitted", async () => {
     let poolBusy = 0
-    pool.emitter.on('busy', () => poolBusy++)
+    pool.emitter.on(PoolEvents.busy, () => ++poolBusy)
     for (let i = 0; i < numberOfWorkers * 2; i++) {
-      promises.push(pool.execute({ test: 'test' }))
+      pool.execute()
     }
     // The `busy` event is triggered when the number of submitted tasks at once reach the number of fixed pool workers.
     // So in total numberOfWorkers + 1 times for a loop submitting up to numberOfWorkers * 2 tasks to the fixed pool.
     expect(poolBusy).toBe(numberOfWorkers + 1)
   })
 
+  it('Verify that tasks queuing is working', async () => {
+    const maxMultiplier = 10
+    const promises = new Set()
+    for (let i = 0; i < numberOfWorkers * maxMultiplier; i++) {
+      promises.add(queuePool.execute())
+    }
+    expect(promises.size).toBe(numberOfWorkers * maxMultiplier)
+    for (const workerNode of queuePool.workerNodes) {
+      expect(workerNode.tasksUsage.running).toBeLessThanOrEqual(
+        queuePool.opts.tasksQueueOptions.concurrency
+      )
+      expect(workerNode.tasksUsage.run).toBe(0)
+      expect(workerNode.tasksQueue.size).toBeGreaterThan(0)
+    }
+    expect(queuePool.numberOfRunningTasks).toBe(numberOfWorkers)
+    expect(queuePool.numberOfQueuedTasks).toBe(
+      numberOfWorkers * maxMultiplier - numberOfWorkers
+    )
+    await Promise.all(promises)
+    for (const workerNode of queuePool.workerNodes) {
+      expect(workerNode.tasksUsage.running).toBe(0)
+      expect(workerNode.tasksUsage.run).toBeGreaterThan(0)
+      expect(workerNode.tasksQueue.size).toBe(0)
+    }
+    promises.clear()
+  })
+
   it('Verify that is possible to have a worker that return undefined', async () => {
     const result = await emptyPool.execute()
-    expect(result).toBeFalsy()
+    expect(result).toBeUndefined()
   })
 
   it('Verify that data are sent to the worker correctly', async () => {
     const data = { f: 10 }
     const result = await echoPool.execute(data)
-    expect(result).toBeTruthy()
-    expect(result.f).toBe(data.f)
+    expect(result).toStrictEqual(data)
   })
 
   it('Verify that error handling is working properly:sync', async () => {
@@ -119,28 +154,50 @@ describe('Fixed cluster pool test suite', () => {
 
   it('Verify that async function is working properly', async () => {
     const data = { f: 10 }
-    const startTime = new Date().getTime()
+    const startTime = performance.now()
     const result = await asyncPool.execute(data)
-    const usedTime = new Date().getTime() - startTime
-    expect(result).toBeTruthy()
-    expect(result.f).toBe(data.f)
+    const usedTime = performance.now() - startTime
+    expect(result).toStrictEqual(data)
     expect(usedTime).toBeGreaterThanOrEqual(2000)
   })
 
   it('Shutdown test', async () => {
     const exitPromise = TestUtils.waitExits(pool, numberOfWorkers)
     await pool.destroy()
-    const res = await exitPromise
-    expect(res).toBe(numberOfWorkers)
+    const numberOfExitEvents = await exitPromise
+    expect(numberOfExitEvents).toBe(numberOfWorkers)
+  })
+
+  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, {
+      env: { TEST: 'test' },
+      settings: { args: ['--use', 'http'], silent: true }
+    })
+    expect(pool1.opts.env).toStrictEqual({ TEST: 'test' })
+    expect(pool1.opts.settings).toStrictEqual({
+      args: ['--use', 'http'],
+      silent: true
+    })
+    expect({ ...pool1.opts.settings, exec: workerFilePath }).toStrictEqual({
+      args: ['--use', 'http'],
+      silent: true,
+      exec: workerFilePath
+    })
+    await pool1.destroy()
   })
 
   it('Should work even without opts in input', async () => {
     const pool1 = new FixedClusterPool(
-      1,
+      numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
     )
-    const res = await pool1.execute({ test: 'test' })
-    expect(res).toBeFalsy()
+    const res = await pool1.execute()
+    expect(res).toBe(false)
     // We need to clean up the resources after our test
     await pool1.destroy()
   })
@@ -149,6 +206,6 @@ describe('Fixed cluster pool test suite', () => {
     expect(
       () =>
         new FixedClusterPool(0, './tests/worker-files/cluster/testWorker.js')
-    ).toThrowError(new Error('Cannot instantiate a fixed pool with no worker'))
+    ).toThrowError('Cannot instantiate a fixed pool with no worker')
   })
 })