From 61af70a3924290cc54e624802d2176e993b157cf Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Wed, 9 Mar 2016 11:35:12 +0000 Subject: [PATCH] Some more tests around edge cases --- app/celery/tasks.py | 2 +- tests/app/celery/test_tasks.py | 27 +++++++++++++++++++++++++++ tests/app/notifications/test_rest.py | 4 ++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/celery/tasks.py b/app/celery/tasks.py index ccc2248ad..613e3261c 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -36,7 +36,7 @@ def process_job(job_id): job_size = job.notification_count total_sent = stats.emails_requested + stats.sms_requested - if total_sent + job_size >= sending_limit: + if total_sent + job_size > sending_limit: finished = datetime.utcnow() job.status = 'finished' job.processing_finished = finished diff --git a/tests/app/celery/test_tasks.py b/tests/app/celery/test_tasks.py index 7aec58964..b16e9fdc4 100644 --- a/tests/app/celery/test_tasks.py +++ b/tests/app/celery/test_tasks.py @@ -80,6 +80,33 @@ def test_should_not_process_sms_job_if_would_exceed_send_limits(notify_db, notif tasks.send_email.apply_async.assert_not_called +@freeze_time("2016-01-01 11:09:00.061258") +def test_should_process_sms_job_if_exactly_on_send_limits(notify_db, notify_db_session, mocker): + service = sample_service(notify_db, notify_db_session, limit=10) + template = sample_email_template(notify_db, notify_db_session, service=service) + job = sample_job(notify_db, notify_db_session, service=service, template=template) + + mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_email')) + mocker.patch('app.celery.tasks.send_email.apply_async') + mocker.patch('app.encryption.encrypt', return_value="something_encrypted") + mocker.patch('app.celery.tasks.create_uuid', return_value="uuid") + + process_job(job.id) + + s3.get_job_from_s3.assert_called_once_with(job.bucket_name, job.id) + job = jobs_dao.dao_get_job_by_id(job.id) + assert job.status == 'finished' + tasks.send_email.apply_async.assert_called_with( + (str(job.service_id), + "uuid", + job.template.subject, + "{}@{}".format(job.service.email_from, "test.notify.com"), + "something_encrypted", + "2016-01-01T11:09:00.061258"), + queue="bulk-email" + ) + + def test_should_not_create_send_task_for_empty_file(sample_job, mocker): mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('empty')) mocker.patch('app.celery.tasks.send_sms.apply_async') diff --git a/tests/app/notifications/test_rest.py b/tests/app/notifications/test_rest.py index 76051ee63..7ad77ad47 100644 --- a/tests/app/notifications/test_rest.py +++ b/tests/app/notifications/test_rest.py @@ -797,7 +797,7 @@ def test_should_block_api_call_if_over_day_limit_regardless_of_type(notify_db, n sample_notification(notify_db, notify_db_session, template=email_template, service=service) data = { - 'to': '+441234123123', + 'to': '+447234123123', 'template': sms_template.id } @@ -813,7 +813,7 @@ def test_should_block_api_call_if_over_day_limit_regardless_of_type(notify_db, n data=json.dumps(data), headers=[('Content-Type', 'application/json'), auth_header]) json_resp = json.loads(response.get_data(as_text=True)) - + print(json_resp) assert response.status_code == 429 assert 'Exceeded send limits (1) for today' in json_resp['message']