From 28881126dd2ce52b9879cd30b3e3ef414ac1b074 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 5 Jan 2024 17:14:00 +0100 Subject: [PATCH] test: cleanup issue #1748 test 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 | 28 +++++++++++----------------- tests/pools/thread/dynamic.test.mjs | 28 +++++++++++----------------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/tests/pools/cluster/dynamic.test.mjs b/tests/pools/cluster/dynamic.test.mjs index cc8f2c0c..fa318f4b 100644 --- a/tests/pools/cluster/dynamic.test.mjs +++ b/tests/pools/cluster/dynamic.test.mjs @@ -161,24 +161,18 @@ describe('Dynamic cluster pool test suite', () => { ) expect(pool.starting).toBe(false) expect(pool.workerNodes.length).toBe(pool.info.minSize) - const maxMultiplier = 10000 - const promises = new Set() - for (let i = 0; i < max * maxMultiplier; i++) { - promises.add(pool.execute()) - } - await Promise.all(promises) - expect(pool.workerNodes.length).toBe(max) - await waitWorkerEvents(pool, 'exit', max) - expect(pool.workerNodes.length).toBe(pool.info.minSize) - // pool.enableTasksQueue(true, { concurrency: 2 }) - promises.clear() - for (let i = 0; i < max * maxMultiplier; i++) { - promises.add(pool.execute()) + for (let run = 0; run < 4; run++) { + // pool.enableTasksQueue(true, { concurrency: 2 }) + const maxMultiplier = 10000 + const promises = new Set() + for (let i = 0; i < max * maxMultiplier; i++) { + promises.add(pool.execute()) + } + await Promise.all(promises) + expect(pool.workerNodes.length).toBe(max) + await waitWorkerEvents(pool, 'exit', max) + expect(pool.workerNodes.length).toBe(pool.info.minSize) } - await Promise.all(promises) - expect(pool.workerNodes.length).toBe(max) - await waitWorkerEvents(pool, 'exit', max) - expect(pool.workerNodes.length).toBe(pool.info.minSize) // We need to clean up the resources after our test await pool.destroy() }) diff --git a/tests/pools/thread/dynamic.test.mjs b/tests/pools/thread/dynamic.test.mjs index 7b951aaf..e0e05c4e 100644 --- a/tests/pools/thread/dynamic.test.mjs +++ b/tests/pools/thread/dynamic.test.mjs @@ -161,24 +161,18 @@ describe('Dynamic thread pool test suite', () => { ) expect(pool.starting).toBe(false) expect(pool.workerNodes.length).toBe(pool.info.minSize) - const maxMultiplier = 10000 - const promises = new Set() - for (let i = 0; i < max * maxMultiplier; i++) { - promises.add(pool.execute()) - } - await Promise.all(promises) - expect(pool.workerNodes.length).toBe(max) - await waitWorkerEvents(pool, 'exit', max) - expect(pool.workerNodes.length).toBe(pool.info.minSize) - // pool.enableTasksQueue(true, { concurrency: 2 }) - promises.clear() - for (let i = 0; i < max * maxMultiplier; i++) { - promises.add(pool.execute()) + for (let run = 0; run < 4; run++) { + // pool.enableTasksQueue(true, { concurrency: 2 }) + const maxMultiplier = 10000 + const promises = new Set() + for (let i = 0; i < max * maxMultiplier; i++) { + promises.add(pool.execute()) + } + await Promise.all(promises) + expect(pool.workerNodes.length).toBe(max) + await waitWorkerEvents(pool, 'exit', max) + expect(pool.workerNodes.length).toBe(pool.info.minSize) } - await Promise.all(promises) - expect(pool.workerNodes.length).toBe(max) - await waitWorkerEvents(pool, 'exit', max) - expect(pool.workerNodes.length).toBe(pool.info.minSize) // We need to clean up the resources after our test await pool.destroy() }) -- 2.34.1