repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix pool execute promises fullfilment in tests
[poolifier.git]
/
tests
/
pools
/
cluster
/
dynamic.test.js
diff --git
a/tests/pools/cluster/dynamic.test.js
b/tests/pools/cluster/dynamic.test.js
index 05d8cdd482c5edad35c3024453777e68654ae0d3..9e4a6b235134408f83537dec6a60652acdb52a58 100644
(file)
--- a/
tests/pools/cluster/dynamic.test.js
+++ b/
tests/pools/cluster/dynamic.test.js
@@
-1,4
+1,4
@@
-const
expect
= require('expect')
+const
{ expect }
= require('expect')
const { DynamicClusterPool } = require('../../../lib/index')
const TestUtils = require('../../test-utils')
const min = 1
const { DynamicClusterPool } = require('../../../lib/index')
const TestUtils = require('../../test-utils')
const min = 1
@@
-21,14
+21,17
@@
describe('Dynamic cluster pool test suite', () => {
it('Verify that new workers are created when required, max size is not exceeded and that after a while new workers will die', async () => {
const promises = []
it('Verify that new workers are created when required, max size is not exceeded and that after a while new workers will die', async () => {
const promises = []
- let
fullPool
= 0
- pool.emitter.on('
FullPool', () => fullPool
++)
+ let
poolBusy
= 0
+ pool.emitter.on('
busy', () => poolBusy
++)
for (let i = 0; i < max * 2; i++) {
promises.push(pool.execute({ test: 'test' }))
}
for (let i = 0; i < max * 2; i++) {
promises.push(pool.execute({ test: 'test' }))
}
+ await Promise.all(promises)
expect(pool.workers.length).toBeLessThanOrEqual(max)
expect(pool.workers.length).toBeGreaterThan(min)
expect(pool.workers.length).toBeLessThanOrEqual(max)
expect(pool.workers.length).toBeGreaterThan(min)
- expect(fullPool > 1).toBeTruthy()
+ // The `busy` event is triggered when the number of submitted tasks at once reach the max number of workers in the dynamic pool.
+ // So in total numberOfWorkers + 1 times for a loop submitting up to numberOfWorkers * 2 tasks to the dynamic pool.
+ expect(poolBusy).toBe(max + 1)
const numberOfExitEvents = await TestUtils.waitExits(pool, max - min)
expect(numberOfExitEvents).toBe(max - min)
})
const numberOfExitEvents = await TestUtils.waitExits(pool, max - min)
expect(numberOfExitEvents).toBe(max - min)
})
@@
-52,8
+55,8
@@
describe('Dynamic cluster pool test suite', () => {
it('Shutdown test', async () => {
const exitPromise = TestUtils.waitExits(pool, min)
await pool.destroy()
it('Shutdown test', async () => {
const exitPromise = TestUtils.waitExits(pool, min)
await pool.destroy()
- const
re
s = await exitPromise
- expect(
re
s).toBe(min)
+ const
numberOfExitEvent
s = await exitPromise
+ expect(
numberOfExitEvent
s).toBe(min)
})
it('Validation of inputs test', () => {
})
it('Validation of inputs test', () => {
@@
-69,6
+72,7
@@
describe('Dynamic cluster pool test suite', () => {
'./tests/worker-files/cluster/testWorker.js'
)
const result = await pool1.execute({ test: 'test' })
'./tests/worker-files/cluster/testWorker.js'
)
const result = await pool1.execute({ test: 'test' })
+ expect(result).toBeDefined()
expect(result).toBeFalsy()
// We need to clean up the resources after our test
await pool1.destroy()
expect(result).toBeFalsy()
// We need to clean up the resources after our test
await pool1.destroy()
@@
-78,7
+82,12
@@
describe('Dynamic cluster pool test suite', () => {
const longRunningPool = new DynamicClusterPool(
min,
max,
const longRunningPool = new DynamicClusterPool(
min,
max,
- './tests/worker-files/cluster/longRunningWorkerHardBehavior.js'
+ './tests/worker-files/cluster/longRunningWorkerHardBehavior.js',
+ {
+ errorHandler: e => console.error(e),
+ onlineHandler: () => console.log('long running worker is online'),
+ exitHandler: () => console.log('long running worker exited')
+ }
)
expect(longRunningPool.workers.length).toBe(min)
for (let i = 0; i < max * 10; i++) {
)
expect(longRunningPool.workers.length).toBe(min)
for (let i = 0; i < max * 10; i++) {
@@
-96,7
+105,12
@@
describe('Dynamic cluster pool test suite', () => {
const longRunningPool = new DynamicClusterPool(
min,
max,
const longRunningPool = new DynamicClusterPool(
min,
max,
- './tests/worker-files/cluster/longRunningWorkerSoftBehavior.js'
+ './tests/worker-files/cluster/longRunningWorkerSoftBehavior.js',
+ {
+ errorHandler: e => console.error(e),
+ onlineHandler: () => console.log('long running worker is online'),
+ exitHandler: () => console.log('long running worker exited')
+ }
)
expect(longRunningPool.workers.length).toBe(min)
for (let i = 0; i < max * 10; i++) {
)
expect(longRunningPool.workers.length).toBe(min)
for (let i = 0; i < max * 10; i++) {