test: fix pool ready event emission tests

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index bfc0a7246fa1d3a03d12786e52ff6504685bb024..1a0e1e3d6812a12c32b20dfd2022a671e0c84b64 100644 (file)
--- 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 618a67dcf96879c83ae76e8e1c227df1028eec2d..02c851f9f82b6b4fa8c66490495857ce5b139b1a 100644 (file)
--- 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++) {