From 365b12f66739fa23c0d093830d4e243728b5b712 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Thu, 10 Jul 2025 12:54:34 +0200 Subject: [PATCH] test: refine expectations MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- tests/pools/cluster/dynamic.test.mjs | 21 ++++++++++++++------- tests/pools/cluster/fixed.test.mjs | 4 ++-- tests/pools/thread/dynamic.test.mjs | 21 ++++++++++++++------- tests/pools/thread/fixed.test.mjs | 4 ++-- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/tests/pools/cluster/dynamic.test.mjs b/tests/pools/cluster/dynamic.test.mjs index 48e2fed45..6f0f611d8 100644 --- a/tests/pools/cluster/dynamic.test.mjs +++ b/tests/pools/cluster/dynamic.test.mjs @@ -52,8 +52,8 @@ describe('Dynamic cluster pool test suite', () => { expect(pool.workerNodes.length).toBeLessThanOrEqual(max) expect(pool.workerNodes.length).toBeGreaterThan(min) expect(poolBusy).toBe(1) - const numberOfExitEvents = await waitWorkerEvents(pool, 'exit', max - min) - expect(numberOfExitEvents).toBe(max - min) + const exitEvents = await waitWorkerEvents(pool, 'exit', max - min) + expect(exitEvents).toBe(max - min) expect(pool.workerNodes.length).toBe(min) }) @@ -62,13 +62,15 @@ describe('Dynamic cluster pool test suite', () => { pool.execute() } expect(pool.workerNodes.length).toBeGreaterThan(min) - await waitWorkerEvents(pool, 'exit', max - min) + let exitEvents = await waitWorkerEvents(pool, 'exit', max - min) + expect(exitEvents).toBe(max - min) expect(pool.workerNodes.length).toBe(min) for (let i = 0; i < max * 2; i++) { pool.execute() } expect(pool.workerNodes.length).toBeGreaterThan(min) - await waitWorkerEvents(pool, 'exit', max - min) + exitEvents = await waitWorkerEvents(pool, 'exit', max - min) + expect(exitEvents).toBe(max - min) expect(pool.workerNodes.length).toBe(min) }) @@ -82,7 +84,7 @@ describe('Dynamic cluster pool test suite', () => { PoolEvents.destroy, ]) await pool.destroy() - const numberOfExitEvents = await exitPromise + const exitEvents = await exitPromise expect(pool.info.started).toBe(false) expect(pool.info.ready).toBe(false) expect(pool.emitter.eventNames()).toStrictEqual([ @@ -95,7 +97,7 @@ describe('Dynamic cluster pool test suite', () => { expect(pool.busyEventEmitted).toBe(false) expect(pool.backPressureEventEmitted).toBe(false) expect(pool.workerNodes.length).toBe(0) - expect(numberOfExitEvents).toBe(min) + expect(exitEvents).toBe(min) expect(poolDestroy).toBe(1) }) @@ -121,7 +123,12 @@ describe('Dynamic cluster pool test suite', () => { longRunningPool.execute() } expect(longRunningPool.workerNodes.length).toBe(max) - await waitWorkerEvents(longRunningPool, 'exit', max - min) + const exitEvents = await waitWorkerEvents( + longRunningPool, + 'exit', + max - min + ) + expect(exitEvents).toBe(max - min) expect(longRunningPool.workerNodes.length).toBe(min) expect( longRunningPool.workerChoiceStrategiesContext.workerChoiceStrategies.get( diff --git a/tests/pools/cluster/fixed.test.mjs b/tests/pools/cluster/fixed.test.mjs index a3f69131a..20cfbee86 100644 --- a/tests/pools/cluster/fixed.test.mjs +++ b/tests/pools/cluster/fixed.test.mjs @@ -279,7 +279,7 @@ describe('Fixed cluster pool test suite', () => { pool.emitter.on(PoolEvents.destroy, () => ++poolDestroy) expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.destroy]) await pool.destroy() - const numberOfExitEvents = await exitPromise + const exitEvents = await exitPromise expect(pool.info.started).toBe(false) expect(pool.info.ready).toBe(false) expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.destroy]) @@ -287,7 +287,7 @@ describe('Fixed cluster pool test suite', () => { expect(pool.busyEventEmitted).toBe(false) expect(pool.backPressureEventEmitted).toBe(false) expect(pool.workerNodes.length).toBe(0) - expect(numberOfExitEvents).toBe(numberOfWorkers) + expect(exitEvents).toBe(numberOfWorkers) expect(poolDestroy).toBe(1) }) diff --git a/tests/pools/thread/dynamic.test.mjs b/tests/pools/thread/dynamic.test.mjs index da4d5eae8..d2f478609 100644 --- a/tests/pools/thread/dynamic.test.mjs +++ b/tests/pools/thread/dynamic.test.mjs @@ -52,8 +52,8 @@ describe('Dynamic thread pool test suite', () => { expect(pool.workerNodes.length).toBeLessThanOrEqual(max) expect(pool.workerNodes.length).toBeGreaterThan(min) expect(poolBusy).toBe(1) - const numberOfExitEvents = await waitWorkerEvents(pool, 'exit', max - min) - expect(numberOfExitEvents).toBe(max - min) + const exitEvents = await waitWorkerEvents(pool, 'exit', max - min) + expect(exitEvents).toBe(max - min) expect(pool.workerNodes.length).toBe(min) }) @@ -62,13 +62,15 @@ describe('Dynamic thread pool test suite', () => { pool.execute() } expect(pool.workerNodes.length).toBe(max) - await waitWorkerEvents(pool, 'exit', max - min) + let exitEvents = await waitWorkerEvents(pool, 'exit', max - min) + expect(exitEvents).toBe(max - min) expect(pool.workerNodes.length).toBe(min) for (let i = 0; i < max * 2; i++) { pool.execute() } expect(pool.workerNodes.length).toBe(max) - await waitWorkerEvents(pool, 'exit', max - min) + exitEvents = await waitWorkerEvents(pool, 'exit', max - min) + expect(exitEvents).toBe(max - min) expect(pool.workerNodes.length).toBe(min) }) @@ -82,7 +84,7 @@ describe('Dynamic thread pool test suite', () => { PoolEvents.destroy, ]) await pool.destroy() - const numberOfExitEvents = await exitPromise + const exitEvents = await exitPromise expect(pool.info.started).toBe(false) expect(pool.info.ready).toBe(false) expect(pool.emitter.eventNames()).toStrictEqual([ @@ -95,7 +97,7 @@ describe('Dynamic thread pool test suite', () => { expect(pool.busyEventEmitted).toBe(false) expect(pool.backPressureEventEmitted).toBe(false) expect(pool.workerNodes.length).toBe(0) - expect(numberOfExitEvents).toBe(min) + expect(exitEvents).toBe(min) expect(poolDestroy).toBe(1) }) @@ -121,7 +123,12 @@ describe('Dynamic thread pool test suite', () => { longRunningPool.execute() } expect(longRunningPool.workerNodes.length).toBe(max) - await waitWorkerEvents(longRunningPool, 'exit', max - min) + const exitEvents = await waitWorkerEvents( + longRunningPool, + 'exit', + max - min + ) + expect(exitEvents).toBe(max - min) expect(longRunningPool.workerNodes.length).toBe(min) expect( longRunningPool.workerChoiceStrategiesContext.workerChoiceStrategies.get( diff --git a/tests/pools/thread/fixed.test.mjs b/tests/pools/thread/fixed.test.mjs index f83147c66..ea3d29b09 100644 --- a/tests/pools/thread/fixed.test.mjs +++ b/tests/pools/thread/fixed.test.mjs @@ -307,7 +307,7 @@ describe('Fixed thread pool test suite', () => { pool.emitter.on(PoolEvents.destroy, () => ++poolDestroy) expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.destroy]) await pool.destroy() - const numberOfExitEvents = await exitPromise + const exitEvents = await exitPromise expect(pool.info.started).toBe(false) expect(pool.info.ready).toBe(false) expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.destroy]) @@ -315,7 +315,7 @@ describe('Fixed thread pool test suite', () => { expect(pool.busyEventEmitted).toBe(false) expect(pool.backPressureEventEmitted).toBe(false) expect(pool.workerNodes.length).toBe(0) - expect(numberOfExitEvents).toBe(numberOfThreads) + expect(exitEvents).toBe(numberOfThreads) expect(poolDestroy).toBe(1) }) -- 2.43.0