From 8e2b8dd7c436cdf32f2963f5e15d71b9eccdc883 Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Fri, 21 Oct 2022 13:29:52 +0000 Subject: [PATCH] keep on flakin the flake world --- app/celery/process_ses_receipts_tasks.py | 14 +++++++------- app/inbound_sms/rest.py | 1 - app/notifications/receive_notifications.py | 4 ++-- app/notifications/sns_handlers.py | 8 ++++---- .../app/celery/test_process_ses_receipts_tasks.py | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/celery/process_ses_receipts_tasks.py b/app/celery/process_ses_receipts_tasks.py index 7a35f874a..8a0b3417f 100644 --- a/app/celery/process_ses_receipts_tasks.py +++ b/app/celery/process_ses_receipts_tasks.py @@ -30,8 +30,8 @@ def process_ses_results(self, response): notification_type = ses_message["notificationType"] # TODO remove after smoke testing on prod is implemented current_app.logger.info( - f"Attempting to process SES delivery status message \ - from SNS with type: {notification_type} and body: {ses_message}" + f"Attempting to process SES delivery status message " + f"from SNS with type: {notification_type} and body: {ses_message}" ) bounce_message = None @@ -52,16 +52,16 @@ def process_ses_results(self, response): message_time = iso8601.parse_date(ses_message["mail"]["timestamp"]).replace(tzinfo=None) if datetime.utcnow() - message_time < timedelta(minutes=5): current_app.logger.info( - f"notification not found for reference: {reference}" - f"(while attempting update to {notification_status}). " + f"Notification not found for reference: {reference}" + f"(while attempting update to {notification_status}). " f"Callback may have arrived before notification was" - f"persisted to the DB. Adding task to retry queue" + f"persisted to the DB. Adding task to retry queue" ) self.retry(queue=QueueNames.RETRY) else: current_app.logger.warning( - f"notification not found for reference: {reference} " - f"(while attempting update to {notification_status})" + f"Notification not found for reference: {reference} " + f"(while attempting update to {notification_status})" ) return diff --git a/app/inbound_sms/rest.py b/app/inbound_sms/rest.py index a0439196c..7a82b8920 100644 --- a/app/inbound_sms/rest.py +++ b/app/inbound_sms/rest.py @@ -15,7 +15,6 @@ from app.inbound_sms.inbound_sms_schemas import ( ) from app.schema_validation import validate - inbound_sms = Blueprint( 'inbound_sms', __name__, diff --git a/app/notifications/receive_notifications.py b/app/notifications/receive_notifications.py index 8b93b935e..03009a791 100644 --- a/app/notifications/receive_notifications.py +++ b/app/notifications/receive_notifications.py @@ -61,8 +61,8 @@ def receive_sns_sms(): # since this is an issue with our service <-> number mapping, or no inbound_sms service permission # we should still tell SNS that we received it successfully current_app.logger.warning( - f"Mapping between service and inbound number: {inbound_number} is broken, \ - or service does not have permission to receive inbound sms" + f"Mapping between service and inbound number: {inbound_number} is broken, " + f"or service does not have permission to receive inbound sms" ) return jsonify( result="success", message="SMS-SNS callback succeeded" diff --git a/app/notifications/sns_handlers.py b/app/notifications/sns_handlers.py index dcb6a7e3f..535ec12db 100644 --- a/app/notifications/sns_handlers.py +++ b/app/notifications/sns_handlers.py @@ -58,12 +58,12 @@ def sns_notification_handler(data, headers): response.raise_for_status() except Exception as e: current_app.logger.warning( - f"Attempt to raise_for_status()SubscriptionConfirmation Type \ - message files for response: {response.text} with error {e}" + f"Attempt to raise_for_status()SubscriptionConfirmation Type " + f"message files for response: {response.text} with error {e}" ) raise InvalidRequest( - "SES-SNS callback failed: attempt to raise_for_status()SubscriptionConfirmation \ - Type message failed", 400 + "SES-SNS callback failed: attempt to raise_for_status()SubscriptionConfirmation " + "Type message failed", 400 ) current_app.logger.info("SES-SNS auto-confirm subscription callback succeeded") return message diff --git a/tests/app/celery/test_process_ses_receipts_tasks.py b/tests/app/celery/test_process_ses_receipts_tasks.py index 896ddc079..a90f9f6f8 100644 --- a/tests/app/celery/test_process_ses_receipts_tasks.py +++ b/tests/app/celery/test_process_ses_receipts_tasks.py @@ -198,7 +198,7 @@ def test_ses_callback_should_log_if_notification_is_missing(client, _notify_db, assert process_ses_results(ses_notification_callback(reference='ref')) is None assert mock_retry.call_count == 0 mock_logger.assert_called_once_with( - 'notification not found for reference: ref (while attempting update to delivered)' + 'Notification not found for reference: ref (while attempting update to delivered)' )