From f9dc3d253af02bdd78ad0a845d7734ec1863a9e5 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 20 Sep 2023 16:44:55 +0200 Subject: ✨ Import group: archive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/tests.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'ishtar_common/tests.py') diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 952002e89..19d09a205 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -2524,6 +2524,7 @@ class BaseImportTest(TestCase): def get_group_import(self): root = os.path.join(settings.LIB_BASE_PATH, "archaeological_finds", "tests") + self.root = root importer_filename = os.path.join(root, "importer-group.zip") restore_serialized(importer_filename) imp_group = models.ImporterGroup.objects.get(slug="chantier-des-depots") @@ -2721,7 +2722,7 @@ class ImportTest(BaseImportTest): group_import.unarchive("FE") group_import = models.ImportGroup.objects.get(pk=imprt.pk) - for imprt in group_import.imports.all(): + for imprt in group_import.import_list(): self.assertEqual(imprt.state, "FE") for k in ("error_file", "result_file", "match_file", "imported_images"): field = getattr(imprt, k) @@ -2740,13 +2741,14 @@ class ImportTest(BaseImportTest): profile.delete_image_zip_on_archive = False profile.save() - csv_content = "...." + imp_file = os.path.join(self.root, "importer-group.csv") + with open(imp_file, "r") as f: + csv_content = f.read() + group_import.archive() - group_import = models.Import.objects.get(pk=group_import.pk) + group_import = models.ImportGroup.objects.get(pk=group_import.pk) self.assertEqual(group_import.state, "AC") - self.assertFalse(group_import.error_file) - self.assertFalse(group_import.result_file) - self.assertFalse(group_import.match_file) + self.assertFalse(group_import.imported_file) self.assertTrue(group_import.imported_images) self.assertTrue(group_import.archive_file) self.assertTrue(zipfile.is_zipfile(group_import.archive_file)) @@ -2760,25 +2762,22 @@ class ImportTest(BaseImportTest): files = json.loads(content.read()) self.assertIn("imported_file", files.keys()) self.assertIn(files["imported_file"], name_list) - self.assertIn("error_file", files.keys()) - self.assertIn(files["error_file"], name_list) - self.assertIn("result_file", files.keys()) - self.assertIn(files["result_file"], name_list) - self.assertIn("match_file", files.keys()) - self.assertIn(files["match_file"], name_list) - rev_dict = {v: k for k, v in files.items()} + for idx in range(4): + self.assertIn(f"sub-{idx}-result_file", files.keys()) + self.assertIn(files[f"sub-{idx}-result_file"], name_list) + for idx in range(1, 3): + self.assertIn(f"sub-{idx}-match_file", files.keys()) + self.assertIn(files[f"sub-{idx}-match_file"], name_list) for name in name_list: current_zip.extract(name, tmpdir) - if name.endswith(".txt"): + if name == files["imported_file"]: with open(os.path.join(tmpdir, name), "r") as f: - self.assertEqual(f.read(), "test" + rev_dict[name]) - elif name.endswith(".csv"): # imported file - with open(os.path.join(tmpdir, name), "r") as f: - self.assertEqual(f.read(), csv_content) + result = f.read() + self.assertEqual(result, csv_content) - group_import.unarchive("FE") + group_import.unarchive("F") group_import = models.Import.objects.get(pk=group_import.pk) - self.assertEqual(group_import.state, "FE") + self.assertEqual(group_import.state, "F") for k in ("error_file", "result_file", "match_file", "imported_images"): field = getattr(group_import, k) self.assertTrue(field, "{} is missing in unarchive".format(k)) -- cgit v1.2.3