test: refine expectations

Signed-off-by: Jérôme Benoit <[email protected]>

Author: jerome-benoit

src/pools/abstract-pool.ts

@@ -1695,8 +1695,6 @@ export abstract class AbstractPool<
           this.isWorkerNodeIdle(localWorkerNodeKey) &&
           !this.isWorkerNodeStealing(localWorkerNodeKey))
       ) {
-        // Flag the worker node as not ready immediately
-        this.flagWorkerNodeAsNotReady(localWorkerNodeKey)
         this.destroyWorkerNode(localWorkerNodeKey).catch((error) => {
           this.eventTarget?.dispatchEvent(
             new ErrorEvent(PoolEvents.error, { error }),

src/pools/utils.ts

@@ -462,7 +462,7 @@ export const waitWorkerNodeEvents = async <
   workerNodeEvent: string,
   numberOfEventsToWait: number,
   timeout: number,
-  timeoutRejection: boolean = true,
+  timeoutRejection = true,
 ): Promise<number> => {
   return await new Promise<number>((resolve, reject) => {
     let events = 0

tests/pools/thread/dynamic.test.mjs

@@ -62,12 +62,8 @@ describe({
       expect(pool.workerNodes.length).toBeLessThanOrEqual(max)
       expect(pool.workerNodes.length).toBeGreaterThan(min)
       expect(poolBusy).toBe(1)
-      const numberOfExitEvents = await waitWorkerNodeEvents(
-        pool,
-        'exit',
-        max - min,
-      )
-      expect(numberOfExitEvents).toBe(max - min)
+      const exitEvents = await waitWorkerNodeEvents(pool, 'exit', max - min)
+      expect(exitEvents).toBe(max - min)
       expect(pool.workerNodes.length).toBe(min)
     })
 
@@ -76,13 +72,15 @@ describe({
         pool.execute()
       }
       expect(pool.workerNodes.length).toBe(max)
-      await waitWorkerNodeEvents(pool, 'exit', max - min)
+      let exitEvents = await waitWorkerNodeEvents(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 waitWorkerNodeEvents(pool, 'exit', max - min)
+      exitEvents = await waitWorkerNodeEvents(pool, 'exit', max - min)
+      expect(exitEvents).toBe(max - min)
       expect(pool.workerNodes.length).toBe(min)
     })
 
@@ -91,7 +89,7 @@ describe({
       let poolDestroy = 0
       pool.eventTarget.addEventListener(PoolEvents.destroy, () => ++poolDestroy)
       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.readyEventEmitted).toBe(false)
@@ -100,7 +98,7 @@ describe({
       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)
     })
 
@@ -127,7 +125,12 @@ describe({
         longRunningPool.execute()
       }
       expect(longRunningPool.workerNodes.length).toBe(max)
-      await waitWorkerNodeEvents(longRunningPool, 'exit', max - min)
+      const exitEvents = await waitWorkerNodeEvents(
+        longRunningPool,
+        'exit',
+        max - min,
+      )
+      expect(exitEvents).toBe(max - min)
       expect(longRunningPool.workerNodes.length).toBe(min)
       expect(
         longRunningPool.workerChoiceStrategiesContext.workerChoiceStrategies

tests/pools/thread/fixed.test.mjs

@@ -307,14 +307,14 @@ describe({
       let poolDestroy = 0
       pool.eventTarget.addEventListener(PoolEvents.destroy, () => ++poolDestroy)
       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.readyEventEmitted).toBe(false)
       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)
     })