Merge branch 'main' into jim/091422/deliverycallbacks

tests/app/celery/test_ftp_update_tasks.py

@@ -1,3 +1,4 @@
+import os
 from collections import defaultdict, namedtuple
 from datetime import date, datetime
 
@@ -90,7 +91,10 @@ def test_update_letter_notifications_statuses_calls_with_correct_bucket_location
         update_letter_notifications_statuses(filename='NOTIFY-20170823160812-RSP.TXT')
         s3_mock.assert_called_with('{}-ftp'.format(
             current_app.config['NOTIFY_EMAIL_DOMAIN']),
-            'NOTIFY-20170823160812-RSP.TXT'
+            'NOTIFY-20170823160812-RSP.TXT',
+            os.environ['AWS_ACCESS_KEY_ID'],
+            os.environ['AWS_SECRET_ACCESS_KEY'],
+            os.environ['AWS_REGION'],
         )
 
 

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()

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')

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__')