X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=f38a56c60a52e2e5c65909480e02c6e17707320a;hb=1adc6af72c087b9412e625bc9576be67d40e7397;hp=4c90207cb9ffb61c7a764688a38536b22b5cb65e;hpb=70e79e39c8c80f90dc8875cc74f2d5c4c077cf15;p=poolifier.git diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js index 4c90207c..f38a56c6 100644 --- a/tests/pools/thread/fixed.test.js +++ b/tests/pools/thread/fixed.test.js @@ -1,10 +1,11 @@ const { expect } = require('expect') const { FixedThreadPool, PoolEvents } = require('../../../lib') const { WorkerFunctions } = require('../../test-types') -const TestUtils = require('../../test-utils') +const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils') describe('Fixed thread pool test suite', () => { const numberOfThreads = 6 + const tasksConcurrency = 2 const pool = new FixedThreadPool( numberOfThreads, './tests/worker-files/thread/testWorker.js', @@ -18,7 +19,7 @@ describe('Fixed thread pool test suite', () => { { enableTasksQueue: true, tasksQueueOptions: { - concurrency: 2 + concurrency: tasksConcurrency }, errorHandler: e => console.error(e) } @@ -26,7 +27,7 @@ describe('Fixed thread pool test suite', () => { const emptyPool = new FixedThreadPool( numberOfThreads, './tests/worker-files/thread/emptyWorker.js', - { exitHandler: () => console.log('empty pool worker exited') } + { exitHandler: () => console.info('empty pool worker exited') } ) const echoPool = new FixedThreadPool( numberOfThreads, @@ -65,7 +66,7 @@ describe('Fixed thread pool test suite', () => { let result = await pool.execute({ function: WorkerFunctions.fibonacci }) - expect(result).toBe(121393) + expect(result).toBe(75025) result = await pool.execute({ function: WorkerFunctions.factorial }) @@ -74,10 +75,24 @@ describe('Fixed thread pool test suite', () => { it('Verify that is possible to invoke the execute() method without input', async () => { const result = await pool.execute() - expect(result).toBe(false) + expect(result).toStrictEqual({ ok: 1 }) }) - it("Verify that 'busy' event is emitted", async () => { + it("Verify that 'ready' event is emitted", async () => { + const pool1 = new FixedThreadPool( + numberOfThreads, + './tests/worker-files/thread/testWorker.js', + { + errorHandler: e => console.error(e) + } + ) + let poolReady = 0 + pool1.emitter.on(PoolEvents.ready, () => ++poolReady) + await waitPoolEvents(pool1, 'ready', 1) + expect(poolReady).toBe(1) + }) + + it("Verify that 'busy' event is emitted", () => { let poolBusy = 0 pool.emitter.on(PoolEvents.busy, () => ++poolBusy) for (let i = 0; i < numberOfThreads * 2; i++) { @@ -90,31 +105,42 @@ describe('Fixed thread pool test suite', () => { it('Verify that tasks queuing is working', async () => { const promises = new Set() - const maxMultiplier = 2 + const maxMultiplier = 3 // Must be greater than tasksConcurrency for (let i = 0; i < numberOfThreads * maxMultiplier; i++) { promises.add(queuePool.execute()) } expect(promises.size).toBe(numberOfThreads * maxMultiplier) for (const workerNode of queuePool.workerNodes) { - expect(workerNode.tasksUsage.running).toBeLessThanOrEqual( + expect(workerNode.usage.tasks.executing).toBeLessThanOrEqual( queuePool.opts.tasksQueueOptions.concurrency ) - expect(workerNode.tasksUsage.ran).toBe(0) - expect(workerNode.tasksQueue.size).toBeGreaterThan(0) + expect(workerNode.usage.tasks.executed).toBe(0) + expect(workerNode.usage.tasks.queued).toBe( + maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency + ) + expect(workerNode.usage.tasks.maxQueued).toBe( + maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency + ) } - expect(queuePool.info.runningTasks).toBe(numberOfThreads) + expect(queuePool.info.executingTasks).toBe( + numberOfThreads * queuePool.opts.tasksQueueOptions.concurrency + ) expect(queuePool.info.queuedTasks).toBe( - numberOfThreads * maxMultiplier - numberOfThreads + numberOfThreads * + (maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency) ) expect(queuePool.info.maxQueuedTasks).toBe( - numberOfThreads * maxMultiplier - numberOfThreads + numberOfThreads * + (maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency) ) 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.usage.tasks.executing).toBe(0) + 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 + ) } }) @@ -147,12 +173,13 @@ 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 + name: 'default', + message: new Error('Error Message from ThreadWorker'), + data }) expect( errorPool.workerNodes.some( - workerNode => workerNode.tasksUsage.error === 1 + workerNode => workerNode.usage.tasks.failed === 1 ) ).toBe(true) }) @@ -175,12 +202,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({ - error: new Error('Error Message from ThreadWorker:async'), - errorData: data + name: 'default', + message: new Error('Error Message from ThreadWorker:async'), + data }) expect( asyncErrorPool.workerNodes.some( - workerNode => workerNode.tasksUsage.error === 1 + workerNode => workerNode.usage.tasks.failed === 1 ) ).toBe(true) }) @@ -195,14 +223,14 @@ describe('Fixed thread pool test suite', () => { }) it('Shutdown test', async () => { - const exitPromise = TestUtils.waitWorkerExits(pool, numberOfThreads) + const exitPromise = 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' + const workerFilePath = './tests/worker-files/thread/testWorker.js' let pool1 = new FixedThreadPool(numberOfThreads, workerFilePath) expect(pool1.opts.workerOptions).toBeUndefined() await pool1.destroy() @@ -225,7 +253,7 @@ describe('Fixed thread pool test suite', () => { './tests/worker-files/thread/testWorker.js' ) const res = await pool1.execute() - expect(res).toBe(false) + expect(res).toStrictEqual({ ok: 1 }) // We need to clean up the resources after our test await pool1.destroy() }) @@ -233,6 +261,6 @@ describe('Fixed thread pool test suite', () => { it('Verify that a pool with zero worker fails', async () => { expect( () => new FixedThreadPool(0, './tests/worker-files/thread/testWorker.js') - ).toThrowError('Cannot instantiate a fixed pool with no worker') + ).toThrowError('Cannot instantiate a fixed pool with zero worker') }) })