First batch of flake8 changes.

Many unused variables, and replacing some old fixtures with
admin_request before I realised just how many there where 😩

tests/app/notifications/test_receive_notification.py

@@ -1,4 +1,3 @@
-import uuid
 import base64
 from datetime import datetime
 from unittest.mock import call
@@ -6,7 +5,6 @@ from unittest.mock import call
 import pytest
 from flask import json
 
-from app.dao.services_dao import dao_fetch_service_by_inbound_number
 from app.notifications.receive_notifications import (
     format_mmg_message,
     format_mmg_datetime,
@@ -80,7 +78,7 @@ def test_receive_notification_from_mmg_without_permissions_does_not_persist(
     permissions
 ):
     mocked = mocker.patch("app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async")
-    service = create_service_with_inbound_number(inbound_number='07111111111', service_permissions=permissions)
+    create_service_with_inbound_number(inbound_number='07111111111', service_permissions=permissions)
     data = {
         "ID": "1234",
         "MSISDN": "07111111111",
@@ -113,8 +111,7 @@ def test_receive_notification_from_firetext_without_permissions_does_not_persist
                  return_value=service)
     mocked_send_inbound_sms = mocker.patch(
         "app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async")
-    mocked_has_permissions = mocker.patch(
-        "app.notifications.receive_notifications.has_inbound_sms_permissions", return_value=False)
+    mocker.patch("app.notifications.receive_notifications.has_inbound_sms_permissions", return_value=False)
 
     data = "source=07999999999&destination=07111111111&message=this is a message&time=2017-01-01 12:00:00"
     response = firetext_post(client, data)
@@ -339,7 +336,7 @@ def test_receive_notification_from_firetext_persists_message(notify_db_session,
 
 def test_receive_notification_from_firetext_persists_message_with_normalized_phone(notify_db_session, client, mocker):
     mocker.patch("app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async")
-    mock = mocker.patch('app.notifications.receive_notifications.statsd_client.incr')
+    mocker.patch('app.notifications.receive_notifications.statsd_client.incr')
 
     create_service_with_inbound_number(
         inbound_number='07111111111', service_name='b', service_permissions=[EMAIL_TYPE, SMS_TYPE, INBOUND_SMS_TYPE])

tests/app/notifications/test_rest.py

@@ -244,7 +244,7 @@ def test_get_all_notifications_only_returns_notifications_of_matching_type(
 
 
 @pytest.mark.parametrize('key_type', [KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST])
-def test_no_api_keys_return_job_notifications_by_default(
+def test_do_not_return_job_notifications_by_default(
     client,
     sample_template,
     sample_job,
@@ -254,7 +254,7 @@ def test_no_api_keys_return_job_notifications_by_default(
     normal_api_key = create_api_key(sample_template.service, KEY_TYPE_NORMAL)
     test_api_key = create_api_key(sample_template.service, KEY_TYPE_TEST)
 
-    job_notification = create_notification(sample_template, job=sample_job)
+    create_notification(sample_template, job=sample_job)
     normal_notification = create_notification(sample_template, api_key=normal_api_key)
     team_notification = create_notification(sample_template, api_key=team_api_key)
     test_notification = create_notification(sample_template, api_key=test_api_key)
@@ -307,7 +307,7 @@ def test_only_normal_api_keys_can_return_job_notifications(
                           key_type=KEY_TYPE_TEST)
     save_model_api_key(test_api_key)
 
-    job_notification = create_sample_notification(
+    create_sample_notification(
         notify_db,
         notify_db_session,
         job=sample_job
@@ -381,8 +381,8 @@ def test_should_reject_invalid_page_param(client, sample_email_template):
 
 def test_valid_page_size_param(notify_api, notify_db, notify_db_session, sample_email_template):
     with notify_api.test_request_context():
-        n1 = create_sample_notification(notify_db, notify_db_session)
-        n2 = create_sample_notification(notify_db, notify_db_session)
+        create_sample_notification(notify_db, notify_db_session)
+        create_sample_notification(notify_db, notify_db_session)
         with notify_api.test_client() as client:
             auth_header = create_authorization_header(service_id=sample_email_template.service_id)
 
@@ -399,8 +399,8 @@ def test_valid_page_size_param(notify_api, notify_db, notify_db_session, sample_
 
 def test_invalid_page_size_param(client, notify_db, notify_db_session, sample_email_template):
 
-    n1 = create_sample_notification(notify_db, notify_db_session)
-    n2 = create_sample_notification(notify_db, notify_db_session)
+    create_sample_notification(notify_db, notify_db_session)
+    create_sample_notification(notify_db, notify_db_session)
     auth_header = create_authorization_header(service_id=sample_email_template.service_id)
 
     response = client.get(
@@ -454,12 +454,12 @@ def test_get_all_notifications_returns_empty_list(client, sample_api_key):
 
 
 def test_filter_by_template_type(client, notify_db, notify_db_session, sample_template, sample_email_template):
-    notification_1 = create_sample_notification(
+    create_sample_notification(
         notify_db,
         notify_db_session,
         service=sample_email_template.service,
         template=sample_template)
-    notification_2 = create_sample_notification(
+    create_sample_notification(
         notify_db,
         notify_db_session,
         service=sample_email_template.service,
@@ -480,8 +480,8 @@ def test_filter_by_template_type(client, notify_db, notify_db_session, sample_te
 def test_filter_by_multiple_template_types(client,
                                            sample_template,
                                            sample_email_template):
-    notification_1 = create_notification(sample_template)
-    notification_2 = create_notification(sample_email_template)
+    create_notification(sample_template)
+    create_notification(sample_email_template)
 
     auth_header = create_authorization_header(service_id=sample_email_template.service_id)
 
@@ -496,8 +496,8 @@ def test_filter_by_multiple_template_types(client,
 
 
 def test_filter_by_status(client, sample_email_template):
-    notification_1 = create_notification(sample_email_template, status="delivered")
-    notification_2 = create_notification(sample_email_template)
+    create_notification(sample_email_template, status="delivered")
+    create_notification(sample_email_template)
 
     auth_header = create_authorization_header(service_id=sample_email_template.service_id)
 
@@ -512,8 +512,8 @@ def test_filter_by_status(client, sample_email_template):
 
 
 def test_filter_by_multiple_statuses(client, sample_email_template):
-    notification_1 = create_notification(sample_email_template, status="delivered")
-    notification_2 = create_notification(sample_email_template, status='sending')
+    create_notification(sample_email_template, status="delivered")
+    create_notification(sample_email_template, status='sending')
 
     auth_header = create_authorization_header(service_id=sample_email_template.service_id)
 
@@ -529,9 +529,9 @@ def test_filter_by_multiple_statuses(client, sample_email_template):
 
 
 def test_filter_by_status_and_template_type(client, sample_template, sample_email_template):
-    notification_1 = create_notification(sample_template)
-    notification_2 = create_notification(sample_email_template)
-    notification_3 = create_notification(sample_email_template, status="delivered")
+    create_notification(sample_template)
+    create_notification(sample_email_template)
+    create_notification(sample_email_template, status="delivered")
 
     auth_header = create_authorization_header(service_id=sample_email_template.service_id)