darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-30 06:21:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

make test dvla response file timestamps in a random order

Browse Source 
since there'll be a bunch of threads running functional test tasks at
the same time, there's no point always trying to start from the same
second and then stepping back to the same one-second-back file each
time. Also, this leads us to an increased risk of race conditions.

This change takes the same thirty second range, but shuffles it. The
tests, since they're no longer deterministic, now use a new Matcher
object (w/ credit to alexey) to match any filename from within that
thirty second range
This commit is contained in:
Leo Hemsted
2018-07-17 15:27:43 +01:00
parent 0cfed3f514
commit 5c4f3e246c
3 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/app/celery/test_research_mode_tasks.py
View File

@@ -15,7 +15,13 @@ from app.celery.research_mode_tasks import (
ses_notification_callback,
create_fake_letter_response_file,
)
from tests.conftest import set_config_values
from tests.conftest import set_config_values, Matcher
dvla_response_file_matcher = Matcher(
'dvla_response_file',
lambda x: 'NOTIFY-20180125140000-RSP.TXT' < x <= 'NOTIFY-20180125140030-RSP.TXT'
)
def test_make_mmg_callback(notify_api, rmock):
@@ -108,12 +114,11 @@ def test_failure_firetext_callback(phone_number):
}
@freeze_time("2018-01-25 14:00:00")
@freeze_time("2018-01-25 14:00:30")
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)
mock_s3upload = mocker.patch('app.celery.research_mode_tasks.s3upload')
filename = 'NOTIFY-20180125140000-RSP.TXT'
with requests_mock.Mocker() as request_mock:
request_mock.post(
@@ -128,16 +133,15 @@ def test_create_fake_letter_response_file_uploads_response_file_s3(
filedata='random-ref|Sent|0|Sorted',
region=current_app.config['AWS_REGION'],
bucket_name=current_app.config['DVLA_RESPONSE_BUCKET_NAME'],
file_location=filename
file_location=dvla_response_file_matcher
)
@freeze_time("2018-01-25 14:00:00")
@freeze_time("2018-01-25 14:00:30")
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)
mocker.patch('app.celery.research_mode_tasks.s3upload')
filename = 'NOTIFY-20180125140000-RSP.TXT'
with set_config_values(notify_api, {
'NOTIFY_ENVIRONMENT': 'development'
@@ -154,11 +158,22 @@ def test_create_fake_letter_response_file_calls_dvla_callback_on_development(
assert request_mock.last_request.json() == {
"Type": "Notification",
"MessageId": "some-message-id",
"Message": '{"Records":[{"s3":{"object":{"key":"' + filename + '"}}}]}'
"Message": ANY
}
assert json.loads(request_mock.last_request.json()['Message']) == {
"Records": [
{
"s3": {
"object": {
"key": dvla_response_file_matcher
}
}
}
]
}
@freeze_time("2018-01-25 14:00:00")
@freeze_time("2018-01-25 14:00:30")
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)
@@ -181,15 +196,15 @@ def test_create_fake_letter_response_file_tries_to_create_files_with_other_filen
create_fake_letter_response_file('random-ref')
assert mock_file_exists.mock_calls == [
call('test.notify.com-ftp', 'NOTIFY-20180125140030-RSP.TXT'),
call('test.notify.com-ftp', 'NOTIFY-20180125140029-RSP.TXT'),
call('test.notify.com-ftp', 'NOTIFY-20180125140028-RSP.TXT'),
call('test.notify.com-ftp', dvla_response_file_matcher),
call('test.notify.com-ftp', dvla_response_file_matcher),
call('test.notify.com-ftp', dvla_response_file_matcher),
]
mock_s3upload.assert_called_once_with(
filedata=ANY,
region=ANY,
bucket_name=ANY,
file_location='NOTIFY-20180125140028-RSP.TXT'
file_location=dvla_response_file_matcher
)