From 91798027171d1eb8ec19ca04a454ffdcf0ced3a3 Mon Sep 17 00:00:00 2001 From: venusbb Date: Wed, 17 Jan 2018 12:21:56 +0000 Subject: [PATCH] Fix a typo error on task argument Modify unit test to be more robust --- app/aws/s3.py | 14 +++++++++----- app/celery/scheduled_tasks.py | 2 +- tests/app/celery/test_scheduled_tasks.py | 10 ++++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/aws/s3.py b/app/aws/s3.py index 1b8d436d3..8a8cc79ff 100644 --- a/app/aws/s3.py +++ b/app/aws/s3.py @@ -119,8 +119,12 @@ def get_list_of_files_by_suffix(bucket_name, subfolder='', suffix='', last_modif ) for page in page_iterator: - for obj in page['Contents']: - key = obj['Key'].lower() - if key.endswith(suffix.lower()): - if not last_modified or obj['LastModified'] >= last_modified: - yield key + try: + for obj in page['Contents']: + key = obj['Key'].lower() + if key.endswith(suffix.lower()): + if not last_modified or obj['LastModified'] >= last_modified: + yield key + except KeyError: + # Not content for today + pass diff --git a/app/celery/scheduled_tasks.py b/app/celery/scheduled_tasks.py index 0562e4baa..e5b0fbf55 100644 --- a/app/celery/scheduled_tasks.py +++ b/app/celery/scheduled_tasks.py @@ -465,7 +465,7 @@ def letter_raise_alert_if_no_ack_file_for_zip(): # yesterday = datetime.now(tz=pytz.utc) - timedelta(days=1) yesterday = datetime.utcnow() - timedelta(days=1) for key in s3.get_list_of_files_by_suffix(bucket_name=current_app.config['DVLA_RESPONSE_BUCKET_NAME'], - subfolder='root/dispatch', suffix='.ACK.txt', lastModified=yesterday): + subfolder='root/dispatch', suffix='.ACK.txt', last_modified=yesterday): ack_file_list.append(key) today_str = datetime.utcnow().strftime('%Y%m%d') diff --git a/tests/app/celery/test_scheduled_tasks.py b/tests/app/celery/test_scheduled_tasks.py index e600f1748..6b97ee9b3 100644 --- a/tests/app/celery/test_scheduled_tasks.py +++ b/tests/app/celery/test_scheduled_tasks.py @@ -1029,7 +1029,7 @@ def test_dao_fetch_monthly_historical_stats_by_template_null_template_id_not_cou assert len(result) == 1 -def mock_s3_get_list_match(bucket_name, subfolder='', suffix='', lastModified=None): +def mock_s3_get_list_match(bucket_name, subfolder='', suffix='', last_modified=None): if subfolder == '2018-01-11': return ['NOTIFY.20180111175007.ZIP', 'NOTIFY.20180111175008.ZIP'] @@ -1037,7 +1037,7 @@ def mock_s3_get_list_match(bucket_name, subfolder='', suffix='', lastModified=No return ['root/dispatch/NOTIFY.20180111175733.ACK.txt'] -def mock_s3_get_list_diff(bucket_name, subfolder='', suffix='', lastModified=None): +def mock_s3_get_list_diff(bucket_name, subfolder='', suffix='', last_modified=None): if subfolder == '2018-01-11': return ['NOTIFY.20180111175007.ZIP', 'NOTIFY.20180111175008.ZIP', 'NOTIFY.20180111175009.ZIP', 'NOTIFY.20180111175010.ZIP'] @@ -1054,7 +1054,13 @@ def test_letter_not_raise_alert_if_ack_files_match_zip_list(mocker, notify_db): letter_raise_alert_if_no_ack_file_for_zip() + yesterday = datetime.utcnow() - timedelta(days=1) + subfoldername = datetime.utcnow().strftime('%Y-%m-%d') assert mock_file_list.call_count == 2 + assert mock_file_list.call_args_list == [ + call(bucket_name='test-letters-pdf', subfolder=subfoldername, suffix='.zip'), + call(bucket_name='test.notify.com-ftp', subfolder='root/dispatch', suffix='.ACK.txt', last_modified=yesterday), + ] assert mock_get_file.call_count == 1