From 68659bab1b0b2a0190f3b1fe003c31feb6627572 Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Thu, 7 Dec 2017 11:58:49 +0000 Subject: [PATCH] Fixed processing of incomplete letter jobs - `template` argument passed in to `job_complete` should be `template.template_type` otherwise the job status is incorrectly set --- app/celery/tasks.py | 2 +- tests/app/celery/test_tasks.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 53d714213..54d6090db 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -580,4 +580,4 @@ def process_incomplete_job(job_id): if row_number > resume_from_row: process_row(row_number, recipient, personalisation, template, job, job.service) - job_complete(job, job.service, template, resumed=True) + job_complete(job, job.service, template.template_type, resumed=True) diff --git a/tests/app/celery/test_tasks.py b/tests/app/celery/test_tasks.py index e33956a56..aceb525a0 100644 --- a/tests/app/celery/test_tasks.py +++ b/tests/app/celery/test_tasks.py @@ -1439,6 +1439,7 @@ def test_process_incomplete_job_letter(mocker, sample_letter_template): mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_letter')) mock_letter_saver = mocker.patch('app.celery.tasks.save_letter.apply_async') + mock_build_dvla = mocker.patch('app.celery.tasks.build_dvla_file.apply_async') job = create_job(template=sample_letter_template, notification_count=10, created_at=datetime.utcnow() - timedelta(hours=2), @@ -1453,8 +1454,5 @@ def test_process_incomplete_job_letter(mocker, sample_letter_template): process_incomplete_job(str(job.id)) - completed_job = Job.query.filter(Job.id == job.id).one() - - assert completed_job.job_status == JOB_STATUS_FINISHED - + assert mock_build_dvla.called assert mock_letter_saver.call_count == 8