From 1dcbfefc265e129097c37984b5a1118e42061dcb Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 11 Jul 2023 13:21:14 +0200 Subject: [PATCH] test: fix pool ready event emission tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- tests/pools/cluster/fixed.test.js | 12 +++++------- tests/pools/thread/fixed.test.js | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js index bfc0a724..1a0e1e3d 100644 --- a/tests/pools/cluster/fixed.test.js +++ b/tests/pools/cluster/fixed.test.js @@ -1,7 +1,7 @@ const { expect } = require('expect') const { FixedClusterPool, PoolEvents } = require('../../../lib') const { WorkerFunctions } = require('../../test-types') -const { waitWorkerEvents } = require('../../test-utils') +const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils') describe('Fixed cluster pool test suite', () => { const numberOfWorkers = 6 @@ -77,7 +77,7 @@ describe('Fixed cluster pool test suite', () => { expect(result).toStrictEqual({ ok: 1 }) }) - it.skip("Verify that 'ready' event is emitted", async () => { + it("Verify that 'ready' event is emitted", async () => { const pool1 = new FixedClusterPool( numberOfWorkers, './tests/worker-files/cluster/testWorker.js', @@ -85,17 +85,15 @@ describe('Fixed cluster pool test suite', () => { errorHandler: e => console.error(e) } ) - let poolInfo let poolReady = 0 - pool1.emitter.on(PoolEvents.ready, info => { + pool1.emitter.on(PoolEvents.ready, () => { ++poolReady - poolInfo = info }) + await waitPoolEvents(pool1, PoolEvents.ready, 1) expect(poolReady).toBe(1) - expect(poolInfo).toBeDefined() }) - it("Verify that 'busy' event is emitted", async () => { + it("Verify that 'busy' event is emitted", () => { let poolBusy = 0 pool.emitter.on(PoolEvents.busy, () => ++poolBusy) for (let i = 0; i < numberOfWorkers * 2; i++) { diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js index 618a67dc..02c851f9 100644 --- a/tests/pools/thread/fixed.test.js +++ b/tests/pools/thread/fixed.test.js @@ -1,7 +1,7 @@ const { expect } = require('expect') const { FixedThreadPool, PoolEvents } = require('../../../lib') const { WorkerFunctions } = require('../../test-types') -const { waitWorkerEvents } = require('../../test-utils') +const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils') describe('Fixed thread pool test suite', () => { const numberOfThreads = 6 @@ -77,7 +77,7 @@ describe('Fixed thread pool test suite', () => { expect(result).toStrictEqual({ ok: 1 }) }) - it.skip("Verify that 'ready' event is emitted", async () => { + it("Verify that 'ready' event is emitted", async () => { const pool1 = new FixedThreadPool( numberOfThreads, './tests/worker-files/thread/testWorker.js', @@ -85,17 +85,15 @@ describe('Fixed thread pool test suite', () => { errorHandler: e => console.error(e) } ) - let poolInfo let poolReady = 0 - pool1.emitter.on(PoolEvents.ready, info => { + pool1.emitter.on(PoolEvents.ready, () => { ++poolReady - poolInfo = info }) + await waitPoolEvents(pool1, 'ready', 1) expect(poolReady).toBe(1) - expect(poolInfo).toBeDefined() }) - it("Verify that 'busy' event is emitted", async () => { + it("Verify that 'busy' event is emitted", () => { let poolBusy = 0 pool.emitter.on(PoolEvents.busy, () => ++poolBusy) for (let i = 0; i < numberOfThreads * 2; i++) { -- 2.34.1