X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.mjs;h=85415d63d2b9cdb3835c9e1fd5354c59211bb74b;hb=fea198e84b17af4bd0f63cb2984447afbd1a7192;hp=fd7f5935697d9e2074d1f9734b6b2345159e9775;hpb=1cc6e9ef64f399f4ca58da8079ef72a011ac4227;p=poolifier.git diff --git a/tests/pools/thread/fixed.test.mjs b/tests/pools/thread/fixed.test.mjs index fd7f5935..85415d63 100644 --- a/tests/pools/thread/fixed.test.mjs +++ b/tests/pools/thread/fixed.test.mjs @@ -1,8 +1,8 @@ import { expect } from 'expect' -import { FixedThreadPool, PoolEvents } from '../../../lib/index.js' -import { TaskFunctions } from '../../test-types.js' -import { waitPoolEvents, waitWorkerEvents } from '../../test-utils.js' -import { DEFAULT_TASK_NAME } from '../../../lib/utils.js' +import { FixedThreadPool, PoolEvents } from '../../../lib/index.cjs' +import { TaskFunctions } from '../../test-types.cjs' +import { waitPoolEvents, waitWorkerEvents } from '../../test-utils.cjs' +import { DEFAULT_TASK_NAME } from '../../../lib/utils.cjs' describe('Fixed thread pool test suite', () => { const numberOfThreads = 6 @@ -130,6 +130,7 @@ describe('Fixed thread pool test suite', () => { expect(workerNode.usage.tasks.maxQueued).toBe( maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency ) + expect(workerNode.usage.tasks.sequentiallyStolen).toBe(0) expect(workerNode.usage.tasks.stolen).toBe(0) } expect(queuePool.info.executedTasks).toBe(0) @@ -157,6 +158,12 @@ describe('Fixed thread pool test suite', () => { expect(workerNode.usage.tasks.maxQueued).toBe( maxMultiplier - queuePool.opts.tasksQueueOptions.concurrency ) + expect(workerNode.usage.tasks.sequentiallyStolen).toBeGreaterThanOrEqual( + 0 + ) + expect(workerNode.usage.tasks.sequentiallyStolen).toBeLessThanOrEqual( + numberOfThreads * maxMultiplier + ) expect(workerNode.usage.tasks.stolen).toBeGreaterThanOrEqual(0) expect(workerNode.usage.tasks.stolen).toBeLessThanOrEqual( numberOfThreads * maxMultiplier @@ -202,8 +209,9 @@ describe('Fixed thread pool test suite', () => { error = e } expect(result).toStrictEqual({ ok: 1 }) - expect(error).toStrictEqual( - new TypeError('Found invalid object in transferList') + expect(error).toBeInstanceOf(Error) + expect(error.message).toMatch( + /Found invalid (object|value) in transferList/ ) }) @@ -292,6 +300,8 @@ describe('Fixed thread pool test suite', () => { await pool.destroy() const numberOfExitEvents = await exitPromise expect(pool.started).toBe(false) + expect(pool.readyEventEmitted).toBe(false) + expect(pool.emitter.eventNames()).toStrictEqual([]) expect(pool.workerNodes.length).toBe(0) expect(numberOfExitEvents).toBe(numberOfThreads) expect(poolDestroy).toBe(1) @@ -341,6 +351,6 @@ describe('Fixed thread pool test suite', () => { it('Verify that a pool with zero worker fails', () => { expect( () => new FixedThreadPool(0, './tests/worker-files/thread/testWorker.mjs') - ).toThrowError('Cannot instantiate a fixed pool with zero worker') + ).toThrow('Cannot instantiate a fixed pool with zero worker') }) })