test: refine expectations

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/tests/pools/cluster/dynamic.test.mjs b/tests/pools/cluster/dynamic.test.mjs
index 48e2fed45c48ebd10f6013b4e2f8020502e6a023..6f0f611d8f807ca90c903c10592c6f817decdddc 100644 (file)
--- 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 a3f69131acc8bfcfd21867f131e89e1e1fed7c07..20cfbee86891a50218a9d17c66d39aca8434bdbb 100644 (file)
--- 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 da4d5eae8f61fcd5cb18e3924497ce149b0ee77a..d2f478609f6495803e26cb5f4d0423289b82122c 100644 (file)
--- 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 f83147c66dd841d5f36f7b9ca3375d0c4a36b6a2..ea3d29b09f364ee5af40307c32e53231b3bd01cd 100644 (file)
--- 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)
   })