WIP enforce letter page limit

This commit is contained in:
Pea Tyczynska
2019-09-27 11:12:12 +01:00
parent 3f35c634cd
commit 69d86064f4
7 changed files with 21 additions and 17 deletions

View File

@@ -426,7 +426,7 @@ def test_process_letter_task_check_virus_scan_passed(
s3 = boto3.client('s3', region_name='eu-west-1')
s3.put_object(Bucket=source_bucket_name, Key=filename, Body=b'old_pdf')
mock_get_page_count = mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=1)
mock_get_billable_units_for_pdf = mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=1)
mock_s3upload = mocker.patch('app.celery.letters_pdf_tasks.s3upload')
endpoint = 'http://localhost:9999/precompiled/sanitise'
with requests_mock.mock() as rmock:
@@ -456,7 +456,7 @@ def test_process_letter_task_check_virus_scan_passed(
file_location=destination_folder + filename,
region='eu-west-1',
)
mock_get_page_count.assert_called_once_with(b'old_pdf')
mock_get_billable_units_for_pdf.assert_called_once_with(b'old_pdf')
@freeze_time('2018-01-01 18:00')
@@ -480,7 +480,7 @@ def test_process_letter_task_check_virus_scan_passed_when_sanitise_fails(
sample_letter_notification.key_type = key_type
mock_move_s3 = mocker.patch('app.letters.utils._move_s3_object')
mock_sanitise = mocker.patch('app.celery.letters_pdf_tasks._sanitise_precompiled_pdf', return_value=None)
mock_get_page_count = mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=2)
mock_get_billable_units_for_pdf = mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=2)
process_virus_scan_passed(filename)
@@ -496,7 +496,7 @@ def test_process_letter_task_check_virus_scan_passed_when_sanitise_fails(
target_bucket_name, filename
)
mock_get_page_count.assert_called_once_with(b'pdf_content')
mock_get_billable_units_for_pdf.assert_called_once_with(b'pdf_content')
@freeze_time('2018-01-01 18:00')
@@ -522,7 +522,7 @@ def test_process_letter_task_check_virus_scan_passed_when_redaction_fails(
sample_letter_notification.status = NOTIFICATION_PENDING_VIRUS_CHECK
sample_letter_notification.key_type = key_type
mock_copy_s3 = mocker.patch('app.letters.utils._copy_s3_object')
mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=2)
mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=2)
endpoint = 'http://localhost:9999/precompiled/sanitise'
with requests_mock.mock() as rmock:
@@ -574,13 +574,13 @@ def test_process_letter_task_check_virus_scan_passed_when_file_cannot_be_opened(
sample_letter_notification.key_type = key_type
mock_move_s3 = mocker.patch('app.letters.utils._move_s3_object')
mock_get_page_count = mocker.patch('app.celery.letters_pdf_tasks.get_page_count', side_effect=PdfReadError)
mock_get_billable_units_for_pdf = mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', side_effect=PdfReadError)
mock_sanitise = mocker.patch('app.celery.letters_pdf_tasks._sanitise_precompiled_pdf')
process_virus_scan_passed(filename)
mock_sanitise.assert_not_called()
mock_get_page_count.assert_called_once_with(b'pdf_content')
mock_get_billable_units_for_pdf.assert_called_once_with(b'pdf_content')
mock_move_s3.assert_called_once_with(
source_bucket_name, filename,
target_bucket_name, filename
@@ -606,7 +606,7 @@ def test_process_virus_scan_passed_logs_error_and_sets_tech_failure_if_s3_error_
s3 = boto3.client('s3', region_name='eu-west-1')
s3.put_object(Bucket=source_bucket_name, Key=filename, Body=b'pdf_content')
mocker.patch('app.celery.letters_pdf_tasks.get_page_count', return_value=1)
mocker.patch('app.celery.letters_pdf_tasks.get_billable_units_for_pdf', return_value=1)
error_response = {
'Error': {