From 099c17192d1d8e65284266aa5335eeafd05010aa Mon Sep 17 00:00:00 2001
From: Martyn Inglis <martyn.inglis@digital.cabinet-office.gov.uk>
Date: Thu, 2 Jun 2016 09:30:01 +0100
Subject: [PATCH] Merged provider stats only on success branch

- ensures that don't raise stats in research mode
---
 app/celery/tasks.py            | 22 +++++++++++-----------
 tests/app/celery/test_tasks.py |  3 +--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/celery/tasks.py b/app/celery/tasks.py
index 761e01543..b20fe59c2 100644
--- a/app/celery/tasks.py
+++ b/app/celery/tasks.py
@@ -268,11 +268,11 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
                     reference=str(notification_id)
                 )
 
-            update_notification_after_sent_to_provider(
-                notification_id,
-                'sms',
-                provider.get_name()
-            )
+                update_notification_after_sent_to_provider(
+                    notification_id,
+                    'sms',
+                    provider.get_name()
+                )
 
         except SmsClientException as e:
             current_app.logger.error(
@@ -349,12 +349,12 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
                     reply_to_addresses=reply_to_addresses,
                 )
 
-            update_notification_after_sent_to_provider(
-                notification_id,
-                'email',
-                provider.get_name(),
-                reference=reference
-            )
+                update_notification_after_sent_to_provider(
+                    notification_id,
+                    'email',
+                    provider.get_name(),
+                    reference=reference
+                )
 
         except EmailClientException as e:
             current_app.logger.exception(e)
diff --git a/tests/app/celery/test_tasks.py b/tests/app/celery/test_tasks.py
index 8315ad362..e73c0d391 100644
--- a/tests/app/celery/test_tasks.py
+++ b/tests/app/celery/test_tasks.py
@@ -331,8 +331,7 @@ def test_should_process_all_sms_job(sample_job,
     )
     assert encryption.encrypt.call_args[0][0]['to'] == '+441234123120'
     assert encryption.encrypt.call_args[0][0]['template'] == str(sample_job_with_placeholdered_template.template.id)
-    assert encryption.encrypt.call_args[0][0][
-               'template_version'] == sample_job_with_placeholdered_template.template.version
+    assert encryption.encrypt.call_args[0][0]['template_version'] == sample_job_with_placeholdered_template.template.version  # noqa
     assert encryption.encrypt.call_args[0][0]['personalisation'] == {'name': 'chris'}
     tasks.send_sms.apply_async.call_count == 10
     job = jobs_dao.dao_get_job_by_id(sample_job_with_placeholdered_template.id)