Skip to content

Commit 12ff57e

Browse files
committed
fixup! Make mirror_file fail if file object already exists (#7134)
1 parent 7f74f2c commit 12ff57e

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

test/indexer/test_mirror_controller.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,16 @@ def test_mirroring(self):
9696
with self.subTest('mirror_partition'):
9797
file, file_message = self._test_mirror_partition(partition_message)
9898

99-
with self.subTest('mirror_file', corrupted=False):
99+
with self.subTest('mirror_file', corrupted=False, exists=False):
100100
self._test_mirror_file(file, file_message)
101101
self._s3.delete_object(Bucket=self.bucket,
102102
Key=self.mirror_controller.service.info_object_key(file))
103+
with self.subTest('mirror_file', corrupted=False, exists=True):
104+
self._test_reuploaded_file(file_message)
103105

104106
with self.subTest('mirror_file', corrupted=True):
105107
self._test_corrupted_download(file_message)
106108

107-
108109
_file_contents = b'lorem ipsum dolor sit\n'
109110

110111
@property
@@ -172,6 +173,14 @@ def _test_corrupted_download(self, file_message):
172173
self.mirror_controller.mirror(event)
173174
self.assertTrue(R.caused(e.exception))
174175

176+
def _test_reuploaded_file(self, file_message):
177+
event = [self._mock_sqs_record(file_message)]
178+
with patch.object(MirrorService, '_download', return_value=self._file_contents):
179+
with self.assertRaises(AssertionError) as e:
180+
self.mirror_controller.mirror(event)
181+
self.assertTrue(R.caused(e.exception))
182+
self.assertEqual(e.exception.args[0].args[0], 'Object exists')
183+
175184
def test_info_schema(self):
176185
client = http_client(log)
177186
file = MagicMock(content_type='text/plain')

0 commit comments

Comments
 (0)