From 08494ef206dba59dda28a7429261281b5740c871 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Tue, 28 Nov 2017 17:21:21 +0000 Subject: [PATCH] more flake8. lots of unused imports and variables that didn't get used. i tried to preserve old variable names as comments when it looked like they were useful (eg when they were describing timestamps) --- .../app/authentication/test_authentication.py | 3 +- tests/app/celery/test_research_mode_tasks.py | 2 - tests/app/celery/test_scheduled_tasks.py | 7 +-- tests/app/celery/test_statistics_tasks.py | 9 +++- tests/app/celery/test_tasks.py | 43 +++++++++---------- tests/app/clients/test_mmg.py | 2 - .../test_letter_api_notification_dao.py | 4 +- .../notification_dao/test_notification_dao.py | 2 +- tests/app/dao/test_api_key_dao.py | 1 - tests/app/dao/test_inbound_numbers_dao.py | 2 - tests/app/dao/test_inbound_sms_dao.py | 4 +- tests/app/dao/test_jobs_dao.py | 2 +- tests/app/dao/test_organisations_dao.py | 6 +-- tests/app/dao/test_provider_details_dao.py | 2 - tests/app/dao/test_provider_rates_dao.py | 1 - .../dao/test_service_email_reply_to_dao.py | 6 +-- tests/app/dao/test_service_sms_sender_dao.py | 1 + tests/app/dao/test_service_whitelist_dao.py | 3 +- tests/app/dao/test_services_dao.py | 39 +++++++++++------ tests/app/dao/test_statistics_dao.py | 12 ++++-- tests/app/dao/test_templates_dao.py | 10 ++--- tests/app/db.py | 1 - tests/app/delivery/test_send_to_providers.py | 4 +- tests/app/inbound_number/test_rest.py | 3 +- tests/app/inbound_sms/test_rest.py | 12 +++--- tests/app/invite/test_invite_rest.py | 2 +- tests/app/letters/test_send_letter_jobs.py | 2 - .../rest/test_send_notification.py | 2 +- tests/app/organisation/test_rest.py | 5 +-- tests/app/service/test_rest.py | 11 +++-- 30 files changed, 99 insertions(+), 104 deletions(-) diff --git a/tests/app/authentication/test_authentication.py b/tests/app/authentication/test_authentication.py index a439717e7..ba2fdbaf1 100644 --- a/tests/app/authentication/test_authentication.py +++ b/tests/app/authentication/test_authentication.py @@ -9,7 +9,6 @@ import flask from flask import json, current_app from freezegun import freeze_time from notifications_python_client.authentication import create_jwt_token -from notifications_utils.request_helper import check_proxy_header_before_request from app import api_user from app.dao.api_key_dao import get_unsigned_secrets, save_model_api_key, get_unsigned_secret, expire_api_key @@ -281,7 +280,7 @@ def test_authentication_returns_error_when_service_has_no_secrets(client, def test_should_attach_the_current_api_key_to_current_app(notify_api, sample_service, sample_api_key): - with notify_api.test_request_context() as context, notify_api.test_client() as client: + with notify_api.test_request_context(), notify_api.test_client() as client: token = __create_token(sample_api_key.service_id) response = client.get( '/notifications', diff --git a/tests/app/celery/test_research_mode_tasks.py b/tests/app/celery/test_research_mode_tasks.py index 2c6bed80e..82a3e21df 100644 --- a/tests/app/celery/test_research_mode_tasks.py +++ b/tests/app/celery/test_research_mode_tasks.py @@ -11,8 +11,6 @@ from app.celery.research_mode_tasks import ( mmg_callback, firetext_callback, ses_notification_callback, - ses_hard_bounce_callback, - ses_soft_bounce_callback ) diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index 6bdce0f6f..bf1e242f3 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -714,11 +714,8 @@ def test_run_letter_jobs(client, mocker, sample_letter_template): def test_run_letter_jobs_does_nothing_if_no_ready_jobs(client, mocker, sample_letter_template): - job_ids = [ - str(create_job(sample_letter_template, job_status=JOB_STATUS_IN_PROGRESS).id), - str(create_job(sample_letter_template, job_status=JOB_STATUS_SENT_TO_DVLA).id) - ] - + create_job(sample_letter_template, job_status=JOB_STATUS_IN_PROGRESS) + create_job(sample_letter_template, job_status=JOB_STATUS_SENT_TO_DVLA) mock_celery = mocker.patch("app.celery.tasks.notify_celery.send_task") run_letter_jobs() diff --git a/tests/app/celery/test_statistics_tasks.py b/tests/app/celery/test_statistics_tasks.py index 40d20117d..bb6c4c5b6 100644 --- a/tests/app/celery/test_statistics_tasks.py +++ b/tests/app/celery/test_statistics_tasks.py @@ -7,8 +7,13 @@ from app.celery.statistics_tasks import ( from sqlalchemy.exc import SQLAlchemyError from app import create_uuid from tests.app.conftest import sample_notification -from app.models import NOTIFICATION_STATUS_TYPES_COMPLETED, NOTIFICATION_SENT, NOTIFICATION_SENDING, \ - NOTIFICATION_PENDING, NOTIFICATION_CREATED, NOTIFICATION_DELIVERED +from app.models import ( + NOTIFICATION_STATUS_TYPES_COMPLETED, + NOTIFICATION_SENDING, + NOTIFICATION_PENDING, + NOTIFICATION_CREATED, + NOTIFICATION_DELIVERED, +) def test_should_create_initial_job_task_if_notification_is_related_to_a_job( diff --git a/tests/app/celery/test_tasks.py b/tests/app/celery/test_tasks.py index f8cc31a4c..46426a791 100644 --- a/tests/app/celery/test_tasks.py +++ b/tests/app/celery/test_tasks.py @@ -53,7 +53,6 @@ from tests.app.conftest import ( sample_job as create_sample_job, sample_email_template as create_sample_email_template, sample_notification as create_sample_notification, - sample_letter_job ) from tests.app.db import ( create_inbound_sms, @@ -683,7 +682,7 @@ def test_should_update_job_to_sent_to_dvla_in_research_mode_for_letter_job( mocker.patch('app.celery.tasks.save_letter.apply_async') mocker.patch('app.celery.tasks.create_uuid', return_value=fake_uuid) mocker.patch('app.celery.tasks.encryption.encrypt', return_value=test_encrypted_data) - mock_dvla_file_task = mocker.patch('app.celery.tasks.build_dvla_file.apply_async') + mocker.patch('app.celery.tasks.build_dvla_file.apply_async') process_job(sample_letter_job.id) @@ -1071,7 +1070,7 @@ def test_build_dvla_file(sample_letter_template, mocker): create_notification(template=job.template, job=job) create_notification(template=job.template, job=job) mocked_upload = mocker.patch("app.celery.tasks.s3upload") - mocked_send_task = mocker.patch("app.celery.tasks.notify_celery.send_task") + mocker.patch("app.celery.tasks.notify_celery.send_task") mocker.patch("app.celery.tasks.LetterDVLATemplate", return_value='dvla|string') build_dvla_file(job.id) @@ -1210,17 +1209,15 @@ def test_send_inbound_sms_to_service_retries_if_request_returns_500(notify_api, status_code=500) send_inbound_sms_to_service(inbound_sms.id, inbound_sms.service_id) - exc_msg = 'Unable to send_inbound_sms_to_service for service_id: {} and url: {url}'.format( - sample_service.id, - url=inbound_api.url - ) assert mocked.call_count == 1 assert mocked.call_args[1]['queue'] == 'retry-tasks' def test_send_inbound_sms_to_service_retries_if_request_throws_unknown(notify_api, sample_service, mocker): - inbound_api = create_service_inbound_api(service=sample_service, url="https://some.service.gov.uk/", - bearer_token="something_unique") + create_service_inbound_api( + service=sample_service, + url="https://some.service.gov.uk/", + bearer_token="something_unique") inbound_sms = create_inbound_sms(service=sample_service, notify_number="0751421", user_number="447700900111", provider_date=datetime(2017, 6, 20), content="Here is some content") @@ -1229,10 +1226,6 @@ def test_send_inbound_sms_to_service_retries_if_request_throws_unknown(notify_ap send_inbound_sms_to_service(inbound_sms.id, inbound_sms.service_id) - exc_msg = 'Unable to send_inbound_sms_to_service for service_id: {} and url: {url}'.format( - sample_service.id, - url=inbound_api.url - ) assert mocked.call_count == 1 assert mocked.call_args[1]['queue'] == 'retry-tasks' @@ -1254,15 +1247,19 @@ def test_send_inbound_sms_to_service_does_not_retries_if_request_returns_404(not def test_check_job_status_task_does_not_raise_error(sample_template): - job = create_job(template=sample_template, notification_count=3, - created_at=datetime.utcnow() - timedelta(hours=2), - scheduled_for=datetime.utcnow() - timedelta(minutes=31), - processing_started=datetime.utcnow() - timedelta(minutes=31), - job_status=JOB_STATUS_FINISHED) - job_2 = create_job(template=sample_template, notification_count=3, - created_at=datetime.utcnow() - timedelta(minutes=31), - processing_started=datetime.utcnow() - timedelta(minutes=31), - job_status=JOB_STATUS_FINISHED) + create_job( + template=sample_template, + notification_count=3, + created_at=datetime.utcnow() - timedelta(hours=2), + scheduled_for=datetime.utcnow() - timedelta(minutes=31), + processing_started=datetime.utcnow() - timedelta(minutes=31), + job_status=JOB_STATUS_FINISHED) + create_job( + template=sample_template, + notification_count=3, + created_at=datetime.utcnow() - timedelta(minutes=31), + processing_started=datetime.utcnow() - timedelta(minutes=31), + job_status=JOB_STATUS_FINISHED) check_job_status() @@ -1405,7 +1402,7 @@ def test_process_incomplete_job_no_job_in_database(mocker, fake_uuid): mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms')) mock_save_sms = mocker.patch('app.celery.tasks.save_sms.apply_async') - with pytest.raises(expected_exception=Exception) as e: + with pytest.raises(expected_exception=Exception): process_incomplete_job(fake_uuid) assert mock_save_sms.call_count == 0 # There is no job in the db it will not have been called diff --git a/tests/app/clients/test_mmg.py b/tests/app/clients/test_mmg.py index 73bbc012e..c2947ca75 100644 --- a/tests/app/clients/test_mmg.py +++ b/tests/app/clients/test_mmg.py @@ -1,5 +1,3 @@ -import json - import pytest import requests_mock from requests import HTTPError diff --git a/tests/app/dao/notification_dao/test_letter_api_notification_dao.py b/tests/app/dao/notification_dao/test_letter_api_notification_dao.py index 41869b15e..4a624f3eb 100644 --- a/tests/app/dao/notification_dao/test_letter_api_notification_dao.py +++ b/tests/app/dao/notification_dao/test_letter_api_notification_dao.py @@ -35,7 +35,7 @@ def test_should_only_get_created_letters(sample_letter_template): def test_should_only_get_api_letters(sample_letter_template, sample_letter_job): api_noti = create_notification(sample_letter_template) - job_noti = create_notification(sample_letter_template, job=sample_letter_job) + create_notification(sample_letter_template, job=sample_letter_job) ret = dao_set_created_live_letter_api_notifications_to_pending() @@ -44,7 +44,7 @@ def test_should_only_get_api_letters(sample_letter_template, sample_letter_job): def test_should_only_get_normal_api_letters(sample_letter_template): live_noti = create_notification(sample_letter_template, key_type=KEY_TYPE_NORMAL) - test_noti = create_notification(sample_letter_template, key_type=KEY_TYPE_TEST) + create_notification(sample_letter_template, key_type=KEY_TYPE_TEST) ret = dao_set_created_live_letter_api_notifications_to_pending() diff --git a/tests/app/dao/notification_dao/test_notification_dao.py b/tests/app/dao/notification_dao/test_notification_dao.py index 4e1ab2945..8d88ef2f9 100644 --- a/tests/app/dao/notification_dao/test_notification_dao.py +++ b/tests/app/dao/notification_dao/test_notification_dao.py @@ -1331,7 +1331,7 @@ def test_dao_timeout_notifications_doesnt_affect_letters(sample_letter_template) def test_should_return_notifications_excluding_jobs_by_default(sample_template, sample_job, sample_api_key): - with_job = create_notification(sample_template, job=sample_job) + create_notification(sample_template, job=sample_job) without_job = create_notification(sample_template, api_key=sample_api_key) include_jobs = get_notifications_for_service(sample_template.service_id, include_jobs=True).items diff --git a/tests/app/dao/test_api_key_dao.py b/tests/app/dao/test_api_key_dao.py index aad7861a9..5a3cebeb4 100644 --- a/tests/app/dao/test_api_key_dao.py +++ b/tests/app/dao/test_api_key_dao.py @@ -4,7 +4,6 @@ import pytest from sqlalchemy.exc import IntegrityError from sqlalchemy.orm.exc import NoResultFound -from app import encryption from app.dao.api_key_dao import (save_model_api_key, get_model_api_keys, get_unsigned_secrets, diff --git a/tests/app/dao/test_inbound_numbers_dao.py b/tests/app/dao/test_inbound_numbers_dao.py index ec9a6cc64..06538836b 100644 --- a/tests/app/dao/test_inbound_numbers_dao.py +++ b/tests/app/dao/test_inbound_numbers_dao.py @@ -1,5 +1,3 @@ -import uuid - import pytest from sqlalchemy.exc import IntegrityError diff --git a/tests/app/dao/test_inbound_sms_dao.py b/tests/app/dao/test_inbound_sms_dao.py index 7967d8522..8c8d0305f 100644 --- a/tests/app/dao/test_inbound_sms_dao.py +++ b/tests/app/dao/test_inbound_sms_dao.py @@ -29,7 +29,7 @@ def test_get_all_inbound_sms_when_none_exist(sample_service): def test_get_all_inbound_sms_limits_and_orders(sample_service): with freeze_time('2017-01-01'): - one = create_inbound_sms(sample_service) + create_inbound_sms(sample_service) with freeze_time('2017-01-03'): three = create_inbound_sms(sample_service) with freeze_time('2017-01-02'): @@ -48,7 +48,7 @@ def test_get_all_inbound_sms_filters_on_service(notify_db_session): service_two = create_service(service_name='two') sms_one = create_inbound_sms(service_one) - sms_two = create_inbound_sms(service_two) + create_inbound_sms(service_two) res = dao_get_inbound_sms_for_service(service_one.id) assert len(res) == 1 diff --git a/tests/app/dao/test_jobs_dao.py b/tests/app/dao/test_jobs_dao.py index 2c16e7ba4..16899adb1 100644 --- a/tests/app/dao/test_jobs_dao.py +++ b/tests/app/dao/test_jobs_dao.py @@ -359,7 +359,7 @@ def test_get_jobs_for_service_doesnt_return_test_messages( sample_job, file_name, ): - test_job = create_job( + create_job( notify_db, notify_db_session, sample_template.service, diff --git a/tests/app/dao/test_organisations_dao.py b/tests/app/dao/test_organisations_dao.py index e46c75878..7444f45ef 100644 --- a/tests/app/dao/test_organisations_dao.py +++ b/tests/app/dao/test_organisations_dao.py @@ -1,8 +1,4 @@ -import pytest -from sqlalchemy.exc import IntegrityError - from app.dao.organisations_dao import ( - dao_create_organisation, dao_get_organisations, dao_get_organisation_by_id, dao_update_organisation, @@ -49,7 +45,7 @@ def test_get_organisation_by_id_gets_correct_organisation(notify_db, notify_db_s def test_update_organisation(notify_db, notify_db_session): updated_name = 'new name' - organisation = create_organisation() + create_organisation() organisations_1 = Organisation.query.all() diff --git a/tests/app/dao/test_provider_details_dao.py b/tests/app/dao/test_provider_details_dao.py index ed3f0e1f0..d5ff8318a 100644 --- a/tests/app/dao/test_provider_details_dao.py +++ b/tests/app/dao/test_provider_details_dao.py @@ -67,8 +67,6 @@ def test_can_get_email_providers(restore_provider_details): def test_should_not_error_if_any_provider_in_code_not_in_database(restore_provider_details): - providers = ProviderDetails.query.all() - ProviderDetails.query.filter_by(identifier='mmg').delete() assert clients.get_sms_client('mmg') diff --git a/tests/app/dao/test_provider_rates_dao.py b/tests/app/dao/test_provider_rates_dao.py index c78290a90..417612781 100644 --- a/tests/app/dao/test_provider_rates_dao.py +++ b/tests/app/dao/test_provider_rates_dao.py @@ -1,4 +1,3 @@ -import uuid from datetime import datetime from decimal import Decimal from app.dao.provider_rates_dao import create_provider_rates diff --git a/tests/app/dao/test_service_email_reply_to_dao.py b/tests/app/dao/test_service_email_reply_to_dao.py index 9ee7040a7..30907ff92 100644 --- a/tests/app/dao/test_service_email_reply_to_dao.py +++ b/tests/app/dao/test_service_email_reply_to_dao.py @@ -39,7 +39,7 @@ def test_add_reply_to_email_address_for_service_creates_first_email_for_service( def test_add_reply_to_email_address_for_service_creates_another_email_for_service(notify_db_session): service = create_service() - first_reply_to = create_reply_to_email(service=service, email_address="first@address.com") + create_reply_to_email(service=service, email_address="first@address.com") add_reply_to_email_address_for_service(service_id=service.id, email_address='second@address.com', is_default=False) @@ -56,7 +56,7 @@ def test_add_reply_to_email_address_for_service_creates_another_email_for_servic def test_add_reply_to_email_address_new_reply_to_is_default_existing_reply_to_is_not(notify_db_session): service = create_service() - first_reply_to = create_reply_to_email(service=service, email_address="first@address.com", is_default=True) + create_reply_to_email(service=service, email_address="first@address.com", is_default=True) add_reply_to_email_address_for_service(service_id=service.id, email_address='second@address.com', is_default=True) results = dao_get_reply_to_by_service_id(service_id=service.id) @@ -121,7 +121,7 @@ def test_update_reply_to_email_address(sample_service): def test_update_reply_to_email_address_set_updated_to_default(sample_service): - first_reply_to = create_reply_to_email(service=sample_service, email_address="first@address.com") + create_reply_to_email(service=sample_service, email_address="first@address.com") second_reply_to = create_reply_to_email(service=sample_service, email_address="second@address.com", is_default=False) diff --git a/tests/app/dao/test_service_sms_sender_dao.py b/tests/app/dao/test_service_sms_sender_dao.py index 9689004d2..3edf61856 100644 --- a/tests/app/dao/test_service_sms_sender_dao.py +++ b/tests/app/dao/test_service_sms_sender_dao.py @@ -121,6 +121,7 @@ def test_dao_update_service_sms_sender_raises_exception_when_no_default_after_up service_sms_sender_id=sms_sender.id, is_default=False, sms_sender="updated") + assert 'You must have at least one SMS sender as the default' in str(e.value) def test_update_existing_sms_sender_with_inbound_number(notify_db_session): diff --git a/tests/app/dao/test_service_whitelist_dao.py b/tests/app/dao/test_service_whitelist_dao.py index 49a225136..453816eae 100644 --- a/tests/app/dao/test_service_whitelist_dao.py +++ b/tests/app/dao/test_service_whitelist_dao.py @@ -2,7 +2,8 @@ import uuid from app.models import ( ServiceWhitelist, - MOBILE_TYPE, EMAIL_TYPE) + EMAIL_TYPE, +) from app.dao.service_whitelist_dao import ( dao_fetch_service_whitelist, diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 4eb51725f..d601bd59d 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -590,13 +590,16 @@ def test_fetch_stats_counts_should_ignore_team_key( def test_fetch_stats_for_today_only_includes_today(notify_db, notify_db_session, sample_template): # two created email, one failed email, and one created sms with freeze_time('2001-01-01T23:59:00'): - just_before_midnight_yesterday = create_notification(notify_db, None, to_field='1', status='delivered') + # just_before_midnight_yesterday + create_notification(notify_db, None, to_field='1', status='delivered') with freeze_time('2001-01-02T00:01:00'): - just_after_midnight_today = create_notification(notify_db, None, to_field='2', status='failed') + # just_after_midnight_today + create_notification(notify_db, None, to_field='2', status='failed') with freeze_time('2001-01-02T12:00:00'): - right_now = create_notification(notify_db, None, to_field='3', status='created') + # right_now + create_notification(notify_db, None, to_field='3', status='created') stats = dao_fetch_todays_stats_for_service(sample_template.service_id) @@ -613,14 +616,22 @@ def test_fetch_monthly_historical_stats_separates_months(notify_db, notify_db_se notify_db_session, sample_template ) - _before_start_of_financial_year = notification_history(created_at=datetime(2016, 3, 31)) - start_of_financial_year = notification_history(created_at=datetime(2016, 4, 1)) - start_of_summer = notification_history(created_at=datetime(2016, 6, 20)) - start_of_autumn = notification_history(created_at=datetime(2016, 9, 30, 23, 30, 0)) # October because BST - start_of_winter = notification_history(created_at=datetime(2016, 12, 1), status='delivered') - start_of_spring = notification_history(created_at=datetime(2017, 3, 11)) - end_of_financial_year = notification_history(created_at=datetime(2017, 3, 31)) - _after_end_of_financial_year = notification_history(created_at=datetime(2017, 3, 31, 23, 30)) # after because BST + # _before_start_of_financial_year + notification_history(created_at=datetime(2016, 3, 31)) + # start_of_financial_year + notification_history(created_at=datetime(2016, 4, 1)) + # start_of_summer + notification_history(created_at=datetime(2016, 6, 20)) + # start_of_autumn + notification_history(created_at=datetime(2016, 9, 30, 23, 30, 0)) # October because BST + # start_of_winter + notification_history(created_at=datetime(2016, 12, 1), status='delivered') + # start_of_spring + notification_history(created_at=datetime(2017, 3, 11)) + # end_of_financial_year + notification_history(created_at=datetime(2017, 3, 31)) + # _after_end_of_financial_year + notification_history(created_at=datetime(2017, 3, 31, 23, 30)) # after because BST result = dao_fetch_monthly_historical_stats_for_service(sample_template.service_id, 2016) @@ -687,10 +698,12 @@ def test_dao_fetch_todays_stats_for_all_services_includes_all_services(notify_db def test_dao_fetch_todays_stats_for_all_services_only_includes_today(notify_db, notify_db_session): with freeze_time('2001-01-01T23:59:00'): - just_before_midnight_yesterday = create_notification(notify_db, None, to_field='1', status='delivered') + # just_before_midnight_yesterday + create_notification(notify_db, None, to_field='1', status='delivered') with freeze_time('2001-01-02T00:01:00'): - just_after_midnight_today = create_notification(notify_db, None, to_field='2', status='failed') + # just_after_midnight_today + create_notification(notify_db, None, to_field='2', status='failed') with freeze_time('2001-01-02T12:00:00'): stats = dao_fetch_todays_stats_for_all_services() diff --git a/tests/app/dao/test_statistics_dao.py b/tests/app/dao/test_statistics_dao.py index 5a73ea672..530478f19 100644 --- a/tests/app/dao/test_statistics_dao.py +++ b/tests/app/dao/test_statistics_dao.py @@ -13,12 +13,18 @@ from app.models import ( SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, + NOTIFICATION_STATUS_TYPES, + NOTIFICATION_CREATED, NOTIFICATION_DELIVERED, + NOTIFICATION_FAILED, + NOTIFICATION_PENDING, + NOTIFICATION_PERMANENT_FAILURE, + NOTIFICATION_SENDING, + NOTIFICATION_SENT, + NOTIFICATION_STATUS_SUCCESS, NOTIFICATION_TECHNICAL_FAILURE, NOTIFICATION_TEMPORARY_FAILURE, - NOTIFICATION_PERMANENT_FAILURE, - NOTIFICATION_PENDING, NOTIFICATION_CREATED, NOTIFICATION_FAILED, NOTIFICATION_SENT, NOTIFICATION_SENDING, - NOTIFICATION_STATUS_TYPES_COMPLETED, Notification, NOTIFICATION_STATUS_TYPES, NOTIFICATION_STATUS_SUCCESS) +) from tests.app.conftest import sample_notification, sample_email_template, sample_template, sample_job, sample_service diff --git a/tests/app/dao/test_templates_dao.py b/tests/app/dao/test_templates_dao.py index 62f5c8a8f..9d999c006 100644 --- a/tests/app/dao/test_templates_dao.py +++ b/tests/app/dao/test_templates_dao.py @@ -133,7 +133,7 @@ def test_get_all_templates_for_service(notify_db, notify_db_session, service_fac assert len(dao_get_all_templates_for_service(service_1.id)) == 1 assert len(dao_get_all_templates_for_service(service_2.id)) == 1 - template_1 = create_sample_template( + create_sample_template( notify_db, notify_db_session, template_name='Sample Template 1', @@ -141,7 +141,7 @@ def test_get_all_templates_for_service(notify_db, notify_db_session, service_fac content="Template content", service=service_1 ) - template_2 = create_sample_template( + create_sample_template( notify_db, notify_db_session, template_name='Sample Template 2', @@ -149,7 +149,7 @@ def test_get_all_templates_for_service(notify_db, notify_db_session, service_fac content="Template content", service=service_1 ) - template_3 = create_sample_template( + create_sample_template( notify_db, notify_db_session, template_name='Sample Template 3', @@ -164,7 +164,7 @@ def test_get_all_templates_for_service(notify_db, notify_db_session, service_fac def test_get_all_templates_for_service_is_alphabetised(notify_db, notify_db_session, sample_service): - template_1 = create_sample_template( + create_sample_template( notify_db, notify_db_session, template_name='Sample Template 1', @@ -180,7 +180,7 @@ def test_get_all_templates_for_service_is_alphabetised(notify_db, notify_db_sess content="Template content", service=sample_service ) - template_3 = create_sample_template( + create_sample_template( notify_db, notify_db_session, template_name='Sample Template 3', diff --git a/tests/app/db.py b/tests/app/db.py index 1da012e0a..7c5896b90 100644 --- a/tests/app/db.py +++ b/tests/app/db.py @@ -26,7 +26,6 @@ from app.models import ( User, EMAIL_TYPE, SMS_TYPE, - INBOUND_SMS_TYPE, KEY_TYPE_NORMAL, AnnualBilling, ) diff --git a/tests/app/delivery/test_send_to_providers.py b/tests/app/delivery/test_send_to_providers.py index 5779a55c3..d3c2e08d3 100644 --- a/tests/app/delivery/test_send_to_providers.py +++ b/tests/app/delivery/test_send_to_providers.py @@ -12,7 +12,6 @@ import app from app import mmg_client, firetext_client from app.dao import (provider_details_dao, notifications_dao) from app.dao.provider_details_dao import dao_switch_sms_provider_to_provider_with_identifier -from app.dao.service_sms_sender_dao import dao_add_sms_sender_for_service from app.delivery import send_to_providers from app.models import ( Notification, @@ -30,7 +29,6 @@ from tests.app.db import ( create_service, create_template, create_notification, - create_inbound_number, create_reply_to_email, create_reply_to_email_for_notification, create_service_sms_sender, @@ -818,7 +816,7 @@ def test_send_email_to_provider_should_format_reply_to_email_address( db_notification = create_notification(template=sample_email_template) - reply_to = create_reply_to_email_for_notification( + create_reply_to_email_for_notification( db_notification.id, sample_service, "test@test.com\t" diff --git a/tests/app/inbound_number/test_rest.py b/tests/app/inbound_number/test_rest.py index 91bd39f82..afb8aaff1 100644 --- a/tests/app/inbound_number/test_rest.py +++ b/tests/app/inbound_number/test_rest.py @@ -38,8 +38,7 @@ def test_rest_get_inbound_number_when_service_is_not_assigned_returns_empty_dict def test_rest_set_inbound_number_active_flag_off( admin_request, notify_db_session): service = create_service(service_name='test service 1') - inbound_number = create_inbound_number( - number='1', provider='mmg', active=True, service_id=service.id) + create_inbound_number(number='1', provider='mmg', active=True, service_id=service.id) admin_request.post( 'inbound_number.post_set_inbound_number_off', diff --git a/tests/app/inbound_sms/test_rest.py b/tests/app/inbound_sms/test_rest.py index a0a6d612b..c26979af1 100644 --- a/tests/app/inbound_sms/test_rest.py +++ b/tests/app/inbound_sms/test_rest.py @@ -31,7 +31,7 @@ def test_post_to_get_inbound_sms_with_no_params(admin_request, sample_service): def test_post_to_get_inbound_sms_with_limit(admin_request, sample_service): with freeze_time('2017-01-01'): - one = create_inbound_sms(sample_service) + create_inbound_sms(sample_service) with freeze_time('2017-01-02'): two = create_inbound_sms(sample_service) @@ -72,7 +72,7 @@ def test_post_to_get_inbound_sms_should_error_with_invalid_limit(admin_request, def test_post_to_get_inbound_sms_filters_user_number(admin_request, sample_service, user_number): # user_number in the db is international and normalised one = create_inbound_sms(sample_service, user_number='447700900001') - two = create_inbound_sms(sample_service, user_number='447700900002') + create_inbound_sms(sample_service, user_number='447700900002') data = { 'limit': 1, @@ -93,7 +93,7 @@ def test_post_to_get_inbound_sms_filters_user_number(admin_request, sample_servi def test_post_to_get_inbound_sms_filters_international_user_number(admin_request, sample_service): # user_number in the db is international and normalised one = create_inbound_sms(sample_service, user_number='12025550104') - two = create_inbound_sms(sample_service) + create_inbound_sms(sample_service) data = { 'limit': 1, @@ -156,7 +156,7 @@ def test_old_get_inbound_sms(admin_request, sample_service): def test_old_get_inbound_sms_limits(admin_request, sample_service): with freeze_time('2017-01-01'): - one = create_inbound_sms(sample_service) + create_inbound_sms(sample_service) with freeze_time('2017-01-02'): two = create_inbound_sms(sample_service) @@ -178,7 +178,7 @@ def test_old_get_inbound_sms_limits(admin_request, sample_service): def test_old_get_inbound_sms_filters_user_number(admin_request, sample_service, user_number): # user_number in the db is international and normalised one = create_inbound_sms(sample_service, user_number='447700900001') - two = create_inbound_sms(sample_service, user_number='447700900002') + create_inbound_sms(sample_service, user_number='447700900002') sms = admin_request.get( 'inbound_sms.get_inbound_sms_for_service', @@ -194,7 +194,7 @@ def test_old_get_inbound_sms_filters_user_number(admin_request, sample_service, def test_old_get_inbound_sms_filters_international_user_number(admin_request, sample_service): # user_number in the db is international and normalised one = create_inbound_sms(sample_service, user_number='12025550104') - two = create_inbound_sms(sample_service) + create_inbound_sms(sample_service) sms = admin_request.get( 'inbound_sms.get_inbound_sms_for_service', diff --git a/tests/app/invite/test_invite_rest.py b/tests/app/invite/test_invite_rest.py index fbfa83b58..1c4c6b10a 100644 --- a/tests/app/invite/test_invite_rest.py +++ b/tests/app/invite/test_invite_rest.py @@ -38,7 +38,7 @@ def test_create_invited_user(admin_request, sample_service, mocker, invitation_e def test_create_invited_user_without_auth_type(admin_request, sample_service, mocker, invitation_email_template): - mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') + mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') email_address = 'invited_user@service.gov.uk' invite_from = sample_service.users[0] diff --git a/tests/app/letters/test_send_letter_jobs.py b/tests/app/letters/test_send_letter_jobs.py index 792d55269..937f5f3e8 100644 --- a/tests/app/letters/test_send_letter_jobs.py +++ b/tests/app/letters/test_send_letter_jobs.py @@ -1,5 +1,3 @@ -import uuid - from flask import json from app.variables import LETTER_TEST_API_FILENAME diff --git a/tests/app/notifications/rest/test_send_notification.py b/tests/app/notifications/rest/test_send_notification.py index 5238d547a..4b57c4128 100644 --- a/tests/app/notifications/rest/test_send_notification.py +++ b/tests/app/notifications/rest/test_send_notification.py @@ -174,7 +174,7 @@ def test_send_notification_with_placeholders_replaced_with_unusual_types( expected_body, expected_subject, ): - mocked = mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') + mocker.patch('app.celery.provider_tasks.deliver_email.apply_async') response = client.post( path='/notifications/email', diff --git a/tests/app/organisation/test_rest.py b/tests/app/organisation/test_rest.py index 688f6f74d..b6df542c1 100644 --- a/tests/app/organisation/test_rest.py +++ b/tests/app/organisation/test_rest.py @@ -1,10 +1,7 @@ -from flask import json import pytest from app.models import Organisation -from tests import create_authorization_header - def test_get_organisations(admin_request, notify_db, notify_db_session): org1 = Organisation(colour='#FFFFFF', logo='/path/image.png', name='Org1') @@ -59,7 +56,7 @@ def test_post_create_organisation_without_logo_is_ok(admin_request, notify_db_se 'name': 'test organisation', 'colour': '#0000ff', } - response = admin_request.post( + admin_request.post( 'organisation.create_organisation', _data=data, _expected_status=201, diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index aff2c1a0a..b099b17c7 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -1325,9 +1325,7 @@ def test_get_notification_for_service(client, notify_db, notify_db_session): create_sample_notification(notify_db, notify_db_session, service=service_1), ] - service_2_notifications = [ - create_sample_notification(notify_db, notify_db_session, service=service_2) - ] + create_sample_notification(notify_db, notify_db_session, service=service_2) for notification in service_1_notifications: response = client.get( @@ -1399,7 +1397,8 @@ def test_get_all_notifications_for_service_including_ones_made_by_jobs( ): with_job = sample_notification_with_job(notify_db, notify_db_session, service=sample_service) without_job = create_sample_notification(notify_db, notify_db_session, service=sample_service) - from_test_api_key = create_sample_notification( + # from_test_api_key + create_sample_notification( notify_db, notify_db_session, service=sample_service, key_type=KEY_TYPE_TEST ) @@ -1424,7 +1423,7 @@ def test_get_only_api_created_notifications_for_service( sample_job, sample_template ): - with_job = create_notification(sample_template, job=sample_job) + create_notification(sample_template, job=sample_job) without_job = create_notification(sample_template) resp = admin_request.get( @@ -2364,7 +2363,7 @@ def test_get_email_reply_to_addresses_when_there_are_no_reply_to_email_addresses def test_get_email_reply_to_addresses_with_one_email_address(client, notify_db, notify_db_session): service = create_service() - reply_to = create_reply_to_email(service, 'test@mail.com') + create_reply_to_email(service, 'test@mail.com') response = client.get('/service/{}/email-reply-to'.format(service.id), headers=[create_authorization_header()])