darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-11 17:38:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix mocks in existing s3 client tests

Browse Source 
Some of the tests were calling methods that didn't exist on MagicMock
objects, which meant that they were always passing. For example, tests
using the format of MagicMock.called_once_with(...) were always passing
since a MagicMock does not have the method `called_once_with`. Changing
this to `assert_called_once_with` ensures that the tests fail if they're
called with the wrong arguments.
This commit is contained in:
Katie Smith
2019-01-31 15:12:13 +00:00
parent d654a87f5c
commit b68d0722bb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/app/s3_client/test_s3_logo_client.py
View File

@@ -33,11 +33,12 @@ def test_upload_email_logo_calls_correct_args(client, mocker, fake_uuid, upload_
upload_email_logo(filename=filename, user_id=fake_uuid, filedata=data, region=region)
assert mocked_s3_upload.called_once_with(
mocked_s3_upload.assert_called_once_with(
filedata=data,
region=region,
file_location=upload_filename,
bucket_name=bucket
bucket_name=bucket,
content_type='image/png'
)
@@ -50,8 +51,8 @@ def test_persist_logo(client, mocker, fake_uuid, upload_filename):
persist_logo(upload_filename, new_filename)
assert mocked_get_s3_object.called_once_with(bucket, new_filename)
assert mocked_delete_s3_object.called_once_with(bucket, upload_filename)
mocked_get_s3_object.assert_called_once_with(bucket, new_filename)
mocked_delete_s3_object.assert_called_once_with(upload_filename)
def test_persist_logo_returns_if_not_temp(client, mocker, fake_uuid):
@@ -87,7 +88,6 @@ def test_delete_email_temp_files_created_by_user(client, mocker, fake_uuid):
delete_email_temp_files_created_by(fake_uuid)
assert mocked_delete_s3_object.called_with_args(objs[0].key)
for index, arg in enumerate(mocked_delete_s3_object.call_args_list):
assert arg == call(objs[index].key)
@@ -97,7 +97,7 @@ def test_delete_single_temp_file(client, mocker, fake_uuid, upload_filename):
delete_email_temp_file(upload_filename)
assert mocked_delete_s3_object.called_with_args(upload_filename)
mocked_delete_s3_object.assert_called_with(upload_filename)
def test_does_not_delete_non_temp_file(client, mocker, fake_uuid):
@@ -107,5 +107,5 @@ def test_does_not_delete_non_temp_file(client, mocker, fake_uuid):
with pytest.raises(ValueError) as error:
delete_email_temp_file(filename)
assert mocked_delete_s3_object.called_with_args(filename)
mocked_delete_s3_object.assert_not_called
assert str(error.value) == 'Not a temp file: {}'.format(filename)