From 6f7dd149e217898bde194057eb2bbc912478981c Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Fri, 23 Sep 2016 15:59:23 +0100 Subject: [PATCH] Tidied up pull request comments --- app/clients/sms/firetext.py | 8 ++++---- app/clients/sms/mmg.py | 8 ++++---- app/delivery/send_to_providers.py | 5 +---- tests/app/delivery/test_send_to_providers.py | 3 +-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/clients/sms/firetext.py b/app/clients/sms/firetext.py index fcaf175fc..9617b88bf 100644 --- a/app/clients/sms/firetext.py +++ b/app/clients/sms/firetext.py @@ -75,12 +75,12 @@ class FiretextClient(SmsClient): response.status_code ) - if not success: - self.statsd_client.incr("clients.firetext.error") - self.current_app.logger.error(log_message) - else: + if success: self.current_app.logger.info(log_message) self.statsd_client.incr("clients.firetext.success") + else: + self.statsd_client.incr("clients.firetext.error") + self.current_app.logger.error(log_message) def send_sms(self, to, content, reference, sender=None): diff --git a/app/clients/sms/mmg.py b/app/clients/sms/mmg.py index fb135a9c3..b036d637c 100644 --- a/app/clients/sms/mmg.py +++ b/app/clients/sms/mmg.py @@ -75,12 +75,12 @@ class MMGClient(SmsClient): response.status_code ) - if not success: - self.statsd_client.incr("clients.mmg.error") - self.current_app.logger.error(log_message) - else: + if success: self.current_app.logger.info(log_message) self.statsd_client.incr("clients.mmg.success") + else: + self.statsd_client.incr("clients.mmg.error") + self.current_app.logger.error(log_message) def get_name(self): return self.name diff --git a/app/delivery/send_to_providers.py b/app/delivery/send_to_providers.py index ca36a43a5..8c7c021a8 100644 --- a/app/delivery/send_to_providers.py +++ b/app/delivery/send_to_providers.py @@ -8,10 +8,7 @@ from notifications_utils.template import Template, get_sms_fragment_count from notifications_utils.renderers import HTMLEmail, PlainTextEmail, SMSMessage from app import clients, statsd_client, create_uuid -from app.dao.notifications_dao import ( - get_notification_by_id, - dao_update_notification -) +from app.dao.notifications_dao import dao_update_notification from app.dao.provider_details_dao import get_provider_details_by_notification_type from app.dao.services_dao import dao_fetch_service_by_id from app.celery.research_mode_tasks import send_sms_response, send_email_response diff --git a/tests/app/delivery/test_send_to_providers.py b/tests/app/delivery/test_send_to_providers.py index 3f91d36fc..17b16e063 100644 --- a/tests/app/delivery/test_send_to_providers.py +++ b/tests/app/delivery/test_send_to_providers.py @@ -2,10 +2,9 @@ import uuid from datetime import datetime import pytest -from mock import ANY +from unittest.mock import ANY import app -from sqlalchemy.orm.exc import NoResultFound from app import mmg_client from app.dao import (provider_details_dao, notifications_dao) from app.delivery import send_to_providers