diff options
| -rw-r--r-- | archaeological_context_records/tests.py | 5 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index c9795fce7..6bb293e4d 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -92,7 +92,10 @@ class ImportContextRecordTest(ImportTest, TestCase): # set for a column that references Dating impt.importation() self.assertEqual(len(impt.errors), 4) - self.assertIn("doesn't exist in the database.", impt.errors[0]['error']) + self.assertTrue( + "doesn't exist in the database." in impt.errors[0]['error'] or + "n'existe pas dans la base" in impt.errors[0]['error'] + ) # retry with only Dating (no context record) for cr in models.ContextRecord.objects.all(): diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 52a14ce44..9d5b9c616 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -17,9 +17,6 @@ # See the file COPYING for details. -""" -Unit tests -""" import json import datetime @@ -245,7 +242,10 @@ class ImportOperationTest(ImportTest, TestCase): self.init_ope_targetkey(imp=impt) impt.importation() self.assertEqual(len(impt.errors), 2) - self.assertIn("Importer configuration error", impt.errors[0]['error']) + self.assertTrue( + "Importer configuration error" in impt.errors[0]['error'] or + "Erreur de configuration de l\'importeur" in impt.errors[0]['error'] + ) def test_model_limitation(self): importer, form = self.init_ope_import() @@ -665,7 +665,6 @@ class OperationInitTest(object): self.operations.pop(0) return self.create_operation()[-1] - def tearDown(self): # cleanup for further test if hasattr(self, 'user'): @@ -1195,7 +1194,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase): def post_first_wizard(test_object, final_step_response): test_object.assertEqual(models.Operation.objects.count(), - test_object.operation_number) + test_object.operation_number) operation = models.Operation.objects.get( pk=test_object.operations[0].pk) test_object.assertEqual(operation.operation_type.pk, 2) |