refactor: cleanup queued tasks computation

[poolifier.git] / tests / test-utils.js

diff --git a/tests/test-utils.js b/tests/test-utils.js
index 0e71c718a8eee83c85011e10f417725811ae34f8..24b01e442ef7b0c63afd1a28d3e5261e82c34d6d 100644 (file)
--- a/tests/test-utils.js
+++ b/tests/test-utils.js
@@ -1,23 +1,38 @@
 const { WorkerFunctions } = require('./test-types')
 
 class TestUtils {
-  static async waitExits (pool, numberOfExitEventsToWait) {
+  static async waitWorkerEvents (pool, workerEvent, numberOfEventsToWait) {
     return new Promise(resolve => {
-      let exitEvents = 0
-      if (numberOfExitEventsToWait === 0) {
-        resolve(exitEvents)
+      let events = 0
+      if (numberOfEventsToWait === 0) {
+        resolve(events)
       }
       for (const workerNode of pool.workerNodes) {
-        workerNode.worker.on('exit', () => {
-          ++exitEvents
-          if (exitEvents === numberOfExitEventsToWait) {
-            resolve(exitEvents)
+        workerNode.worker.on(workerEvent, () => {
+          ++events
+          if (events === numberOfEventsToWait) {
+            resolve(events)
           }
         })
       }
     })
   }
 
+  static async waitPoolEvents (pool, poolEvent, numberOfEventsToWait) {
+    return new Promise(resolve => {
+      let events = 0
+      if (numberOfEventsToWait === 0) {
+        resolve(events)
+      }
+      pool.emitter.on(poolEvent, () => {
+        ++events
+        if (events === numberOfEventsToWait) {
+          resolve(events)
+        }
+      })
+    })
+  }
+
   static async sleep (ms) {
     return new Promise(resolve => setTimeout(resolve, ms))
   }