diff --git a/app/celery/scheduled_tasks.py b/app/celery/scheduled_tasks.py index c8154721d..2e0413fe8 100644 --- a/app/celery/scheduled_tasks.py +++ b/app/celery/scheduled_tasks.py @@ -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: diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index ba87a94de..a61c70807 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -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 )