OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved job manager test stability

Browse Source 
no issue

Delays can cause unpredictable test failures. This commit removes a couple delays.
This commit is contained in:
Simon Backx 2023-01-30 14:19:16 +01:00
parent 8f8ca481a6
commit af31e5d910
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ghost/job-manager/test/job-manager.test.js
View File

@ -233,17 +233,14 @@ describe('Job Manager', function () {
};
const spyHandler = sinon.spy();
const jobManager = new JobManager({errorHandler: spyHandler});
const completion = jobManager.awaitCompletion('will-fail');
jobManager.addJob({
job,
name: 'will-fail'
});
// give time to execute the job
// has to be this long because in Node v10 the communication is
// done through processes, which takes longer comparing to worker_threads
// can be reduced to 100 when Node v10 support is dropped
await delay(600);
await assert.rejects(completion, /job error/);
should(spyHandler.called).be.true();
should(spyHandler.args[0][0].message).equal('job error');
@ -338,6 +335,7 @@ describe('Job Manager', function () {
};
const jobManager = new JobManager({JobModel});
const completion = jobManager.awaitCompletion('successful-oneoff');
jobManager.addOneOffJob({
job: async () => {
@ -347,8 +345,7 @@ describe('Job Manager', function () {
offloaded: false
});
// allow job to get picked up and executed
await delay(20);
await completion;
// tracks the job queued
should(JobModel.add.args[0][0].status).equal('queued');
@ -380,6 +377,7 @@ describe('Job Manager', function () {
};
const spyHandler = sinon.spy();
const jobManager = new JobManager({errorHandler: spyHandler, JobModel});
const completion = jobManager.awaitCompletion('failed-oneoff');
await jobManager.addOneOffJob({
job,
@ -387,8 +385,7 @@ describe('Job Manager', function () {
offloaded: false
});
// give time to execute the job
await delay(50);
await assert.rejects(completion, /job error/);
// tracks the job start
should(JobModel.edit.args[0][0].status).equal('started');
@ -424,6 +421,7 @@ describe('Job Manager', function () {
};
const spyHandler = sinon.spy();
const jobManager = new JobManager({errorHandler: spyHandler, JobModel});
const completion1 = jobManager.awaitCompletion('failed-oneoff');
await jobManager.addOneOffJob({
job,
@ -432,11 +430,12 @@ describe('Job Manager', function () {
});
// give time to execute the job and fail
await delay(50);
await assert.rejects(completion1, /job error/);
should(JobModel.edit.args[1][0].status).equal('failed');
// simulate process restart and "fresh" slate to add the job
jobManager.removeJob('failed-oneoff');
const completion2 = jobManager.awaitCompletion('failed-oneoff');
await jobManager.addOneOffJob({
job,
@ -445,7 +444,7 @@ describe('Job Manager', function () {
});
// give time to execute the job and fail AGAIN
await delay(50);
await assert.rejects(completion2, /job error/);
should(JobModel.edit.args[3][0].status).equal('started');
should(JobModel.edit.args[4][0].status).equal('failed');
});
@ -502,18 +501,20 @@ describe('Job Manager', function () {
const jobManager = new JobManager({JobModel});
const jobCompletion = jobManager.awaitCompletion('successful-oneoff');
await jobManager.addOneOffJob({
job: path.resolve(__dirname, './jobs/message.js'),
name: 'successful-oneoff'
});
// allow job to get picked up and executed
await delay(50);
await delay(100);
jobManager.bree.workers['successful-oneoff'].postMessage('be done!');
// allow the message to be passed around
await delay(50);
await jobCompletion;
// tracks the job start
should(JobModel.edit.args[0][0].status).equal('started');
@ -542,16 +543,14 @@ describe('Job Manager', function () {
const spyHandler = sinon.spy();
const jobManager = new JobManager({errorHandler: spyHandler, JobModel});
const completion = jobManager.awaitCompletion('failed-oneoff');
await jobManager.addOneOffJob({
job,
name: 'failed-oneoff'
});
// give time to execute the job
// has to be this long because in Node v10 the communication is
// done through processes, which takes longer comparing to worker_threads
// can be reduced to 100 when Node v10 support is dropped
await delay(100);
await assert.rejects(completion, /job error/);
// still calls the original error handler
should(spyHandler.called).be.true();