From 1a9bc2a5cf1442da49924a20185901c40480f4e4 Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Fri, 23 Mar 2018 14:59:48 +0000 Subject: [PATCH] Move test letters to test letters bucket without date folder name --- app/letters/utils.py | 3 ++- tests/app/letters/test_letter_utils.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/letters/utils.py b/app/letters/utils.py index c79a09a8e..16113c69e 100644 --- a/app/letters/utils.py +++ b/app/letters/utils.py @@ -92,7 +92,8 @@ def move_scanned_pdf_to_test_or_live_pdf_bucket(filename, is_test_letter=False): s3 = boto3.resource('s3') copy_source = {'Bucket': source_bucket_name, 'Key': filename} - target_filename = get_folder_name(datetime.utcnow()) + filename + target_filename = get_folder_name(datetime.utcnow(), is_test_letter) + filename + target_bucket = s3.Bucket(target_bucket_name) obj = target_bucket.Object(target_filename) diff --git a/tests/app/letters/test_letter_utils.py b/tests/app/letters/test_letter_utils.py index 2a071bb0c..662862e50 100644 --- a/tests/app/letters/test_letter_utils.py +++ b/tests/app/letters/test_letter_utils.py @@ -140,13 +140,13 @@ def test_upload_letter_pdf_to_correct_bucket( @mock_s3 -@pytest.mark.parametrize('is_test_letter,bucket_config_name', [ - (False, 'LETTERS_PDF_BUCKET_NAME'), - (True, 'TEST_LETTERS_BUCKET_NAME') +@pytest.mark.parametrize('is_test_letter,bucket_config_name,folder_date_name', [ + (False, 'LETTERS_PDF_BUCKET_NAME', '2018-03-14/'), + (True, 'TEST_LETTERS_BUCKET_NAME', '') ]) @freeze_time(FROZEN_DATE_TIME) def test_move_scanned_letter_pdf_to_processing_bucket( - notify_api, is_test_letter, bucket_config_name + notify_api, is_test_letter, bucket_config_name, folder_date_name ): filename = 'test.pdf' source_bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME'] @@ -161,5 +161,5 @@ def test_move_scanned_letter_pdf_to_processing_bucket( move_scanned_pdf_to_test_or_live_pdf_bucket(filename, is_test_letter=is_test_letter) - assert '2018-03-14/' + filename in [o.key for o in target_bucket.objects.all()] + assert folder_date_name + filename in [o.key for o in target_bucket.objects.all()] assert filename not in [o.key for o in source_bucket.objects.all()]