Added an order by to the check_job_status query. The test was failing intermittently

This commit is contained in:
Rebecca Law
2017-10-18 09:50:39 +01:00
parent 24a87d8260
commit f52ec2c406
2 changed files with 2 additions and 2 deletions

View File

@@ -392,7 +392,7 @@ def check_job_status():
jobs_not_complete_after_30_minutes = Job.query.filter(
Job.job_status == JOB_STATUS_IN_PROGRESS,
and_(thirty_five_minutes_ago < Job.processing_started, Job.processing_started < thirty_minutes_ago)
).all()
).order_by(Job.processing_started).all()
job_ids = [str(x.id) for x in jobs_not_complete_after_30_minutes]
if job_ids:

View File

@@ -831,6 +831,6 @@ def test_check_job_status_task_raises_job_incomplete_error_for_multiple_jobs(moc
mock_celery.assert_called_once_with(
name=TaskNames.PROCESS_INCOMPLETE_JOBS,
args=([str(job_2.id), str(job.id)],),
args=([str(job.id), str(job_2.id)],),
queue=QueueNames.JOBS
)