diff --git a/app/config.py b/app/config.py index f1415e294..d187b38c2 100644 --- a/app/config.py +++ b/app/config.py @@ -116,7 +116,7 @@ class Config(object): # Prefix to identify queues in SQS NOTIFICATION_QUEUE_PREFIX = os.environ.get('NOTIFICATION_QUEUE_PREFIX') - + # Use notify.sandbox.10x sending domain unless overwritten by environment NOTIFY_EMAIL_DOMAIN = 'notify.sandbox.10x.gsa.gov' @@ -416,13 +416,13 @@ class Development(Config): CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload' CONTACT_LIST_BUCKET_NAME = 'local-contact-list' - TEST_LETTERS_BUCKET_NAME = 'development-test-letters' - DVLA_RESPONSE_BUCKET_NAME = 'notify.tools-ftp' - LETTERS_PDF_BUCKET_NAME = 'development-letters-pdf' - LETTERS_SCAN_BUCKET_NAME = 'development-letters-scan' - INVALID_PDF_BUCKET_NAME = 'development-letters-invalid-pdf' - TRANSIENT_UPLOADED_LETTERS = 'development-transient-uploaded-letters' - LETTER_SANITISE_BUCKET_NAME = 'development-letters-sanitise' + # TEST_LETTERS_BUCKET_NAME = 'development-test-letters' + # DVLA_RESPONSE_BUCKET_NAME = 'notify.tools-ftp' + # LETTERS_PDF_BUCKET_NAME = 'development-letters-pdf' + # LETTERS_SCAN_BUCKET_NAME = 'development-letters-scan' + # INVALID_PDF_BUCKET_NAME = 'development-letters-invalid-pdf' + # TRANSIENT_UPLOADED_LETTERS = 'development-transient-uploaded-letters' + # LETTER_SANITISE_BUCKET_NAME = 'development-letters-sanitise' # INTERNAL_CLIENT_API_KEYS = { # Config.ADMIN_CLIENT_ID: ['dev-notify-secret-key'], @@ -437,7 +437,7 @@ class Development(Config): NOTIFY_ENVIRONMENT = 'development' NOTIFY_LOG_PATH = 'application.log' - + NOTIFY_EMAIL_DOMAIN = os.getenv('NOTIFY_EMAIL_DOMAIN', 'notify.sandbox.10x.gsa.gov') SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI', 'postgresql://postgres:chummy@db:5432/notification_api') @@ -470,13 +470,13 @@ class Test(Development): CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload' CONTACT_LIST_BUCKET_NAME = 'test-contact-list' - TEST_LETTERS_BUCKET_NAME = 'test-test-letters' - DVLA_RESPONSE_BUCKET_NAME = 'test.notify.com-ftp' - LETTERS_PDF_BUCKET_NAME = 'test-letters-pdf' - LETTERS_SCAN_BUCKET_NAME = 'test-letters-scan' - INVALID_PDF_BUCKET_NAME = 'test-letters-invalid-pdf' - TRANSIENT_UPLOADED_LETTERS = 'test-transient-uploaded-letters' - LETTER_SANITISE_BUCKET_NAME = 'test-letters-sanitise' + # TEST_LETTERS_BUCKET_NAME = 'test-test-letters' + # DVLA_RESPONSE_BUCKET_NAME = 'test.notify.com-ftp' + # LETTERS_PDF_BUCKET_NAME = 'test-letters-pdf' + # LETTERS_SCAN_BUCKET_NAME = 'test-letters-scan' + # INVALID_PDF_BUCKET_NAME = 'test-letters-invalid-pdf' + # TRANSIENT_UPLOADED_LETTERS = 'test-transient-uploaded-letters' + # LETTER_SANITISE_BUCKET_NAME = 'test-letters-sanitise' # this is overriden in CI SQLALCHEMY_DATABASE_URI = os.getenv('SQLALCHEMY_DATABASE_TEST_URI', 'postgresql://postgres:chummy@db:5432/test_notification_api') @@ -507,13 +507,13 @@ class Preview(Config): NOTIFY_ENVIRONMENT = 'preview' CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload' CONTACT_LIST_BUCKET_NAME = 'preview-contact-list' - TEST_LETTERS_BUCKET_NAME = 'preview-test-letters' - DVLA_RESPONSE_BUCKET_NAME = 'notify.works-ftp' - LETTERS_PDF_BUCKET_NAME = 'preview-letters-pdf' - LETTERS_SCAN_BUCKET_NAME = 'preview-letters-scan' - INVALID_PDF_BUCKET_NAME = 'preview-letters-invalid-pdf' - TRANSIENT_UPLOADED_LETTERS = 'preview-transient-uploaded-letters' - LETTER_SANITISE_BUCKET_NAME = 'preview-letters-sanitise' + # TEST_LETTERS_BUCKET_NAME = 'preview-test-letters' + # DVLA_RESPONSE_BUCKET_NAME = 'notify.works-ftp' + # LETTERS_PDF_BUCKET_NAME = 'preview-letters-pdf' + # LETTERS_SCAN_BUCKET_NAME = 'preview-letters-scan' + # INVALID_PDF_BUCKET_NAME = 'preview-letters-invalid-pdf' + # TRANSIENT_UPLOADED_LETTERS = 'preview-transient-uploaded-letters' + # LETTER_SANITISE_BUCKET_NAME = 'preview-letters-sanitise' FROM_NUMBER = 'preview' API_RATE_LIMIT_ENABLED = True CHECK_PROXY_HEADER = False @@ -524,13 +524,13 @@ class Staging(Config): NOTIFY_ENVIRONMENT = 'staging' CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload' CONTACT_LIST_BUCKET_NAME = 'staging-contact-list' - TEST_LETTERS_BUCKET_NAME = 'staging-test-letters' - DVLA_RESPONSE_BUCKET_NAME = 'staging-notify.works-ftp' - LETTERS_PDF_BUCKET_NAME = 'staging-letters-pdf' - LETTERS_SCAN_BUCKET_NAME = 'staging-letters-scan' - INVALID_PDF_BUCKET_NAME = 'staging-letters-invalid-pdf' - TRANSIENT_UPLOADED_LETTERS = 'staging-transient-uploaded-letters' - LETTER_SANITISE_BUCKET_NAME = 'staging-letters-sanitise' + # TEST_LETTERS_BUCKET_NAME = 'staging-test-letters' + # DVLA_RESPONSE_BUCKET_NAME = 'staging-notify.works-ftp' + # LETTERS_PDF_BUCKET_NAME = 'staging-letters-pdf' + # LETTERS_SCAN_BUCKET_NAME = 'staging-letters-scan' + # INVALID_PDF_BUCKET_NAME = 'staging-letters-invalid-pdf' + # TRANSIENT_UPLOADED_LETTERS = 'staging-transient-uploaded-letters' + # LETTER_SANITISE_BUCKET_NAME = 'staging-letters-sanitise' FROM_NUMBER = 'stage' API_RATE_LIMIT_ENABLED = True CHECK_PROXY_HEADER = True @@ -542,13 +542,13 @@ class Live(Config): CSV_UPLOAD_BUCKET_NAME = 'notifications-prototype-csv-upload' # created in gsa sandbox CONTACT_LIST_BUCKET_NAME = 'notifications-prototype-contact-list-upload' # created in gsa sandbox # TODO: verify below buckets only used for letters - TEST_LETTERS_BUCKET_NAME = 'production-test-letters' # not created in gsa sandbox - DVLA_RESPONSE_BUCKET_NAME = 'notifications.service.gov.uk-ftp' # not created in gsa sandbox - LETTERS_PDF_BUCKET_NAME = 'production-letters-pdf' # not created in gsa sandbox - LETTERS_SCAN_BUCKET_NAME = 'production-letters-scan' # not created in gsa sandbox - INVALID_PDF_BUCKET_NAME = 'production-letters-invalid-pdf' # not created in gsa sandbox - TRANSIENT_UPLOADED_LETTERS = 'production-transient-uploaded-letters' # not created in gsa sandbox - LETTER_SANITISE_BUCKET_NAME = 'production-letters-sanitise' # not created in gsa sandbox + # TEST_LETTERS_BUCKET_NAME = 'production-test-letters' # not created in gsa sandbox + # DVLA_RESPONSE_BUCKET_NAME = 'notifications.service.gov.uk-ftp' # not created in gsa sandbox + # LETTERS_PDF_BUCKET_NAME = 'production-letters-pdf' # not created in gsa sandbox + # LETTERS_SCAN_BUCKET_NAME = 'production-letters-scan' # not created in gsa sandbox + # INVALID_PDF_BUCKET_NAME = 'production-letters-invalid-pdf' # not created in gsa sandbox + # TRANSIENT_UPLOADED_LETTERS = 'production-transient-uploaded-letters' # not created in gsa sandbox + # LETTER_SANITISE_BUCKET_NAME = 'production-letters-sanitise' # not created in gsa sandbox FROM_NUMBER = 'US Notify' API_RATE_LIMIT_ENABLED = True @@ -573,12 +573,12 @@ class Sandbox(CloudFoundryConfig): NOTIFY_ENVIRONMENT = 'sandbox' CSV_UPLOAD_BUCKET_NAME = 'cf-sandbox-notifications-csv-upload' CONTACT_LIST_BUCKET_NAME = 'cf-sandbox-contact-list' - LETTERS_PDF_BUCKET_NAME = 'cf-sandbox-letters-pdf' - TEST_LETTERS_BUCKET_NAME = 'cf-sandbox-test-letters' - DVLA_RESPONSE_BUCKET_NAME = 'notify.works-ftp' - LETTERS_PDF_BUCKET_NAME = 'cf-sandbox-letters-pdf' - LETTERS_SCAN_BUCKET_NAME = 'cf-sandbox-letters-scan' - INVALID_PDF_BUCKET_NAME = 'cf-sandbox-letters-invalid-pdf' + # LETTERS_PDF_BUCKET_NAME = 'cf-sandbox-letters-pdf' + # TEST_LETTERS_BUCKET_NAME = 'cf-sandbox-test-letters' + # DVLA_RESPONSE_BUCKET_NAME = 'notify.works-ftp' + # LETTERS_PDF_BUCKET_NAME = 'cf-sandbox-letters-pdf' + # LETTERS_SCAN_BUCKET_NAME = 'cf-sandbox-letters-scan' + # INVALID_PDF_BUCKET_NAME = 'cf-sandbox-letters-invalid-pdf' FROM_NUMBER = 'sandbox' diff --git a/tests/app/celery/test_nightly_tasks.py b/tests/app/celery/test_nightly_tasks.py index 318521a6f..cbe9c36f7 100644 --- a/tests/app/celery/test_nightly_tasks.py +++ b/tests/app/celery/test_nightly_tasks.py @@ -319,6 +319,7 @@ def test_get_letter_notifications_still_sending_when_they_shouldnt_finds_friday_ @freeze_time('2018-01-11T23:00:00') +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_letter_raise_alert_if_no_ack_file_for_zip_does_not_raise_when_files_match_zip_list(mocker, notify_db_session): mock_file_list = mocker.patch("app.aws.s3.get_list_of_files_by_suffix", side_effect=mock_s3_get_list_match) letter_raise_alert_if_no_ack_file_for_zip() @@ -334,6 +335,7 @@ def test_letter_raise_alert_if_no_ack_file_for_zip_does_not_raise_when_files_mat @freeze_time('2018-01-11T23:00:00') +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_letter_raise_alert_if_ack_files_not_match_zip_list(mocker, notify_db_session): mock_file_list = mocker.patch("app.aws.s3.get_list_of_files_by_suffix", side_effect=mock_s3_get_list_diff) mock_create_ticket = mocker.spy(NotifySupportTicket, '__init__') @@ -360,6 +362,7 @@ def test_letter_raise_alert_if_ack_files_not_match_zip_list(mocker, notify_db_se @freeze_time('2018-01-11T23:00:00') +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_letter_not_raise_alert_if_no_files_do_not_cause_error(mocker, notify_db_session): mock_file_list = mocker.patch("app.aws.s3.get_list_of_files_by_suffix", side_effect=None) letter_raise_alert_if_no_ack_file_for_zip() diff --git a/tests/app/celery/test_research_mode_tasks.py b/tests/app/celery/test_research_mode_tasks.py index b30dc9fa9..7472917d5 100644 --- a/tests/app/celery/test_research_mode_tasks.py +++ b/tests/app/celery/test_research_mode_tasks.py @@ -134,6 +134,7 @@ def test_failure_firetext_callback(phone_number): @freeze_time("2018-01-25 14:00:30") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_create_fake_letter_response_file_uploads_response_file_s3( notify_api, mocker): mocker.patch('app.celery.research_mode_tasks.file_exists', return_value=False) @@ -157,6 +158,7 @@ def test_create_fake_letter_response_file_uploads_response_file_s3( @freeze_time("2018-01-25 14:00:30") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_create_fake_letter_response_file_calls_dvla_callback_on_development( notify_api, mocker): mocker.patch('app.celery.research_mode_tasks.file_exists', return_value=False) @@ -193,6 +195,7 @@ def test_create_fake_letter_response_file_calls_dvla_callback_on_development( @freeze_time("2018-01-25 14:00:30") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_create_fake_letter_response_file_does_not_call_dvla_callback_on_preview( notify_api, mocker): mocker.patch('app.celery.research_mode_tasks.file_exists', return_value=False) @@ -208,6 +211,7 @@ def test_create_fake_letter_response_file_does_not_call_dvla_callback_on_preview @freeze_time("2018-01-25 14:00:30") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_create_fake_letter_response_file_tries_to_create_files_with_other_filenames(notify_api, mocker): mock_file_exists = mocker.patch('app.celery.research_mode_tasks.file_exists', side_effect=[True, True, False]) mock_s3upload = mocker.patch('app.celery.research_mode_tasks.s3upload') @@ -228,6 +232,7 @@ def test_create_fake_letter_response_file_tries_to_create_files_with_other_filen @freeze_time("2018-01-25 14:00:30") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_create_fake_letter_response_file_gives_up_after_thirty_times(notify_api, mocker): mock_file_exists = mocker.patch('app.celery.research_mode_tasks.file_exists', return_value=True) mock_s3upload = mocker.patch('app.celery.research_mode_tasks.s3upload') diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index ab6d1af15..13e831176 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -366,6 +366,7 @@ def test_check_job_status_task_does_not_raise_error(sample_template): @freeze_time("2019-05-30 14:00:00") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_check_if_letters_still_pending_virus_check_restarts_scan_for_stuck_letters( mocker, sample_letter_template @@ -396,6 +397,7 @@ def test_check_if_letters_still_pending_virus_check_restarts_scan_for_stuck_lett @freeze_time("2019-05-30 14:00:00") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_check_if_letters_still_pending_virus_check_raises_zendesk_if_files_cant_be_found( mocker, sample_letter_template @@ -447,6 +449,7 @@ def test_check_if_letters_still_pending_virus_check_raises_zendesk_if_files_cant @freeze_time("2019-05-30 14:00:00") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_check_if_letters_still_in_created_during_bst(mocker, sample_letter_template): mock_logger = mocker.patch('app.celery.tasks.current_app.logger.error') mock_create_ticket = mocker.spy(NotifySupportTicket, '__init__') @@ -481,6 +484,7 @@ def test_check_if_letters_still_in_created_during_bst(mocker, sample_letter_temp @freeze_time("2019-01-30 14:00:00") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_check_if_letters_still_in_created_during_utc(mocker, sample_letter_template): mock_logger = mocker.patch('app.celery.tasks.current_app.logger.error') mock_create_ticket = mocker.spy(NotifySupportTicket, '__init__') diff --git a/tests/app/dao/notification_dao/test_notification_dao_delete_notifications.py b/tests/app/dao/notification_dao/test_notification_dao_delete_notifications.py index a616dee31..ca141c445 100644 --- a/tests/app/dao/notification_dao/test_notification_dao_delete_notifications.py +++ b/tests/app/dao/notification_dao/test_notification_dao_delete_notifications.py @@ -28,6 +28,7 @@ from tests.app.db import ( @mock_s3 @freeze_time('2019-09-01 04:30') +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_move_notifications_deletes_letters_from_s3(sample_letter_template, mocker): s3 = boto3.client('s3', region_name='eu-west-1') bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME'] @@ -53,6 +54,7 @@ def test_move_notifications_deletes_letters_from_s3(sample_letter_template, mock @mock_s3 @freeze_time('2019-09-01 04:30') +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_move_notifications_copes_if_letter_not_in_s3(sample_letter_template, mocker): s3 = boto3.client('s3', region_name='eu-west-1') s3.create_bucket( @@ -91,6 +93,7 @@ def test_move_notifications_does_nothing_if_notification_history_row_already_exi @pytest.mark.parametrize( 'notification_status', ['validation-failed', 'virus-scan-failed'] ) +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_move_notifications_deletes_letters_not_sent_and_in_final_state_from_table_but_not_s3( sample_service, mocker, notification_status ): @@ -115,6 +118,7 @@ def test_move_notifications_deletes_letters_not_sent_and_in_final_state_from_tab @mock_s3 @freeze_time('2020-12-24 04:30') @pytest.mark.parametrize('notification_status', ['delivered', 'returned-letter', 'technical-failure']) +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_move_notifications_deletes_letters_sent_and_in_final_state_from_table_and_s3( sample_service, mocker, notification_status ): @@ -153,6 +157,7 @@ def test_move_notifications_deletes_letters_sent_and_in_final_state_from_table_a @pytest.mark.parametrize('notification_status', ['pending-virus-check', 'created', 'sending']) +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_move_notifications_does_not_delete_letters_not_yet_in_final_state( sample_service, mocker, notification_status ): diff --git a/tests/app/letters/test_letter_utils.py b/tests/app/letters/test_letter_utils.py index ae9b188fa..f4f178950 100644 --- a/tests/app/letters/test_letter_utils.py +++ b/tests/app/letters/test_letter_utils.py @@ -31,6 +31,7 @@ from tests.app.db import create_notification FROZEN_DATE_TIME = "2018-03-14 17:00:00" +pytest.skip(reason="Skipping letter-related functionality for now", allow_module_level=True) @pytest.fixture(name='sample_precompiled_letter_notification') def _sample_precompiled_letter_notification(sample_letter_notification): diff --git a/tests/app/service/send_notification/test_send_pdf_letter_notification.py b/tests/app/service/send_notification/test_send_pdf_letter_notification.py index 2ff40f884..091396fd0 100644 --- a/tests/app/service/send_notification/test_send_pdf_letter_notification.py +++ b/tests/app/service/send_notification/test_send_pdf_letter_notification.py @@ -71,6 +71,7 @@ def test_send_pdf_letter_notification_raises_error_if_service_in_trial_mode( assert 'trial mode' in e.value.message +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_send_pdf_letter_notification_raises_error_when_pdf_is_not_in_transient_letter_bucket( mocker, sample_service_full_permissions, @@ -97,6 +98,7 @@ def test_send_pdf_letter_notification_does_nothing_if_notification_already_exist @freeze_time("2019-08-02 11:00:00") +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_send_pdf_letter_notification_creates_notification_and_moves_letter( mocker, sample_service_full_permissions, diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 0ac2b6407..6102da61a 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -2514,6 +2514,7 @@ def test_send_one_off_notification(sample_service, admin_request, mocker): assert response['id'] == str(noti.id) +@pytest.mark.skip(reason="Skipping letter-related functionality for now") def test_create_pdf_letter(mocker, sample_service_full_permissions, client, fake_uuid, notify_user): mocker.patch('app.service.send_notification.utils_s3download') mocker.patch('app.service.send_notification.get_page_count', return_value=1)