diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/tests.py | 78 |
1 files changed, 41 insertions, 37 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index babaf4380..23c6e9fa2 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -658,10 +658,10 @@ class ImportFindTest(BaseImportFindTest): filename = root + data_name + ".zip" self.restore_serialized(filename) imp_type = ImporterType.objects.get(slug="topographie-mobilier") - imp_file = open(root + data_name + ".csv", "rb") - file_dict = { - "imported_file": SimpleUploadedFile(imp_file.name, imp_file.read()) - } + with open(root + data_name + ".csv", "rb") as imp_file: + file_dict = { + "imported_file": SimpleUploadedFile(imp_file.name, imp_file.read()) + } post_dict = { "importer_type": imp_type.pk, "name": "find_geo_import", @@ -713,7 +713,7 @@ class ImportFindTest(BaseImportFindTest): def test_group_import(self): imp_group, imp_file, imp_media = self.get_group_import() file_dict = { - "imported_file": SimpleUploadedFile(imp_file.name, imp_file.read()) + "imported_file": imp_file } post_dict = { "importer_type": imp_group.pk, @@ -726,8 +726,9 @@ class ImportFindTest(BaseImportFindTest): data=post_dict, files=file_dict, user=self.user ) self.assertFalse(form.is_valid()) - self.assertIn(str(_("This importer need a document archive.")), form.errors["__all__"]) - file_dict["imported_images"] = SimpleUploadedFile(imp_media.name, imp_media.read()) + self.assertIn(str(_("This importer need a document archive.")), + form.errors["__all__"]) + file_dict["imported_images"] = imp_media form = forms_common.NewImportGroupForm( data=post_dict, files=file_dict, user=self.user ) @@ -739,7 +740,6 @@ class ImportFindTest(BaseImportFindTest): nb_find = models.Find.objects.count() nb_container = Container.objects.count() nb_docs = Document.objects.count() - impt.importation() self.assertEqual(models.BaseFind.objects.count(), nb_base_find + 1) @@ -760,17 +760,19 @@ class ImportFindTest(BaseImportFindTest): ImportTarget.objects.create( target="documents__image", formater_type_id=formater.pk, column_id=col.pk ) - mcc_file = open( - settings.LIB_BASE_PATH + "archaeological_finds/tests/MCC-finds-example.csv", - "rb", - ) - mcc_images = open( - settings.LIB_BASE_PATH + "archaeological_finds/tests/images.zip", "rb" - ) - file_dict = { - "imported_file": SimpleUploadedFile(mcc_file.name, mcc_file.read()), - "imported_images": SimpleUploadedFile(mcc_images.name, mcc_images.read()), - } + file_dict = {} + with open( + settings.LIB_BASE_PATH + + "archaeological_finds/tests/MCC-finds-example.csv", "rb") as mcc_file: + file_dict["imported_file"] = SimpleUploadedFile( + mcc_file.name, mcc_file.read() + ) + with open( + settings.LIB_BASE_PATH + + "archaeological_finds/tests/images.zip", "rb") as mcc_file: + file_dict["imported_images"] = SimpleUploadedFile( + mcc_file.name, mcc_file.read() + ) post_dict = { "importer_type": MCC.pk, "skip_lines": 1, @@ -907,10 +909,10 @@ class ImportFindTest(BaseImportFindTest): ] ) - imp_file = open(imp_filename, "rb") - file_dict = { - "imported_file": SimpleUploadedFile(imp_file.name, imp_file.read()) - } + with open(imp_filename, "rb") as imp_file: + file_dict = { + "imported_file": SimpleUploadedFile(imp_file.name, imp_file.read()) + } post_dict = { "importer_type": importer_type.pk, "skip_lines": 1, @@ -1066,13 +1068,13 @@ class ImportFindLiveServerTest(LiveServerTestCase, BaseImportFindTest): ImportTarget.objects.create( target="documents__image", formater_type_id=formater.pk, column_id=col.pk ) - mcc_file = open( - settings.LIB_BASE_PATH + "archaeological_finds/tests/MCC-finds-example.csv", - "rb", - ) - file_dict = { - "imported_file": SimpleUploadedFile(mcc_file.name, mcc_file.read()), - } + with open( + settings.LIB_BASE_PATH + + "archaeological_finds/tests/MCC-finds-example.csv", + "rb") as mcc_file: + file_dict = { + "imported_file": SimpleUploadedFile(mcc_file.name, mcc_file.read()), + } post_dict = { "importer_type": MCC.pk, "skip_lines": 1, @@ -1759,12 +1761,13 @@ class FindSearchTest(FindInit, TestCase, SearchText): image_path = ( settings.LIB_BASE_PATH + "ishtar_common/static/media/images/ishtar-bg.jpg" ) - document.image = SimpleUploadedFile( - name="ishtar-bg.jpg", - content=open(image_path, "rb").read(), - content_type="image/jpeg", - ) - document.save() + with open(image_path, "rb") as content: + document.image = SimpleUploadedFile( + name="ishtar-bg.jpg", + content=content.read(), + content_type="image/jpeg", + ) + document.save() self.finds[0].documents.add(document) self.finds[0].save() @@ -2796,7 +2799,8 @@ class TreatmentTest(FindInit, TestCase): self.create_finds(data_base={"label": "Find 1"}, force=True) self.create_finds(data_base={"label": "Find 2"}, force=True) image = Document.objects.create(title="Image!") - image.image.save("ishtar-bg.jpg", File(open(img, "rb"))) + with open(img, "rb") as cimg: + image.image.save("ishtar-bg.jpg", File(cimg)) self.finds[0].documents.add(image) self.finds[0].save() |