Fix tests for setup.py runtests

5 files changed, 78 insertions, 12 deletions

diff --git a/Makefile.example b/Makefile.example
index 2605b559a..b873d86fd 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -171,6 +171,7 @@ fixtures_operations:
 							archaeological_operations.period \
 							archaeological_operations.remaintype \
 							archaeological_operations.reportstate \
+							archaeological_operations.recordqualitytype \
 	   > '../archaeological_operations/fixtures/initial_data-'$(default_data)'.json'
 	cd $(project); $(PYTHON) ./manage.py dumpdata --indent 4 --natural-primary --natural-foreign  \
 							archaeological_operations.relationtype \
@@ -210,6 +211,7 @@ fixtures_finds:
 							archaeological_finds.batchtype \
 							archaeological_finds.checkedtype \
 							archaeological_finds.treatmentfiletype \
+							archaeological_finds.checkedtype \
 	   > '../archaeological_finds/fixtures/initial_data-'$(default_data)'.json'
 
 fixtures_warehouse:
diff --git a/archaeological_finds/fixtures/initial_data-fr.json b/archaeological_finds/fixtures/initial_data-fr.json
index 3125ab8da..b3cda2cfd 100644
--- a/archaeological_finds/fixtures/initial_data-fr.json
+++ b/archaeological_finds/fixtures/initial_data-fr.json
@@ -7035,5 +7035,35 @@
         "comment": "",
         "available": true
     }
+},
+{
+    "model": "archaeological_finds.checkedtype",
+    "fields": {
+        "label": "Non v\u00e9rifi\u00e9",
+        "txt_idx": "not-checked",
+        "comment": null,
+        "available": true,
+        "order": 10
+    }
+},
+{
+    "model": "archaeological_finds.checkedtype",
+    "fields": {
+        "label": "V\u00e9rifi\u00e9 mais incorrect",
+        "txt_idx": "checked-not-correct",
+        "comment": "",
+        "available": false,
+        "order": 20
+    }
+},
+{
+    "model": "archaeological_finds.checkedtype",
+    "fields": {
+        "label": "V\u00e9rifi\u00e9 et correct",
+        "txt_idx": "checked-correct",
+        "comment": null,
+        "available": true,
+        "order": 30
+    }
 }
 ]
diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json
index 9b794b744..07b4290bb 100644
--- a/archaeological_operations/fixtures/initial_data-fr.json
+++ b/archaeological_operations/fixtures/initial_data-fr.json
@@ -3133,5 +3133,35 @@
         "available": true,
         "order": 4
     }
+},
+{
+    "model": "archaeological_operations.recordqualitytype",
+        "fields": {
+            "label": "Non document\u00e9",
+            "txt_idx": "not-documented",
+            "comment": null,
+            "available": true,
+            "order": 10
+        }
+},
+{
+    "model": "archaeological_operations.recordqualitytype",
+        "fields": {
+            "label": "Arbitraire",
+            "txt_idx": "arbitrary",
+            "comment": null,
+            "available": true,
+            "order": 20
+        }
+},
+{
+    "model": "archaeological_operations.recordqualitytype",
+        "fields": {
+            "label": "Fiable",
+            "txt_idx": "reliable",
+            "comment": null,
+            "available": true,
+            "order": 30
+        }
 }
 ]
diff --git a/example_project/runtests.py b/example_project/runtests.py
index 633a94022..c10a73db4 100644
--- a/example_project/runtests.py
+++ b/example_project/runtests.py
@@ -29,8 +29,7 @@ def runtests():
          "archaeological_operations.tests",
          "archaeological_context_records.tests",
          "archaeological_finds.tests",
-         "archaeological_warehouse.tests",
-         ]
+         "archaeological_warehouse.tests"],
     )
     if not local_settings_exists:
         os.remove(local_settings)
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index bfb66fee0..34b25a6ec 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -78,8 +78,9 @@ COMMON_FIXTURES = [
 OPERATION_FIXTURES = COMMON_FIXTURES + [
     settings.ROOT_PATH +
     '../archaeological_operations/fixtures/initial_data-fr.json',
-    '../archaeological_operations/fixtures/'
-    'initial_data_relation_type_norel-fr.json',
+    settings.ROOT_PATH +
+    '../archaeological_operations/fixtures/initial_data_relation_type_norel-fr.json',
+    settings.ROOT_PATH +
     '../archaeological_operations/fixtures/initial_data_relation_type-fr.json',
 ]
 
@@ -98,19 +99,19 @@ FILE_TOWNS_FIXTURES = OPERATION_TOWNS_FIXTURES + [
 CONTEXT_RECORD_FIXTURES = FILE_FIXTURES + [
     settings.ROOT_PATH +
     '../archaeological_context_records/fixtures/initial_data-fr.json',
-    '../archaeological_context_records/fixtures/'
-    'initial_data_relation_type_norel-fr.json',
-    '../archaeological_context_records/fixtures/'
-    'initial_data_relation_type-fr.json',
+    settings.ROOT_PATH +
+    '../archaeological_context_records/fixtures/initial_data_relation_type_norel-fr.json',
+    settings.ROOT_PATH +
+    '../archaeological_context_records/fixtures/initial_data_relation_type-fr.json',
     ]
 
 CONTEXT_RECORD_TOWNS_FIXTURES = FILE_TOWNS_FIXTURES + [
     settings.ROOT_PATH +
     '../archaeological_context_records/fixtures/initial_data-fr.json',
-    '../archaeological_context_records/fixtures/'
-    'initial_data_relation_type_norel-fr.json',
-    '../archaeological_context_records/fixtures/'
-    'initial_data_relation_type-fr.json',
+    settings.ROOT_PATH +
+    '../archaeological_context_records/fixtures/initial_data_relation_type_norel-fr.json',
+    settings.ROOT_PATH +
+    '../archaeological_context_records/fixtures/initial_data_relation_type-fr.json',
     ]
 
 FIND_FIXTURES = CONTEXT_RECORD_FIXTURES + [
@@ -259,10 +260,12 @@ class CommandsTestCase(TestCase):
         town_nb = q.count()
         out = StringIO()
         call_command('import_geofla_csv',
+                     settings.ROOT_PATH +
                      '../ishtar_common/tests/geofla-test.csv', '--quiet',
                      stdout=out)
         self.assertEqual(town_nb + 9, models.Town.objects.count())
         call_command('import_geofla_csv',
+                     settings.ROOT_PATH +
                      '../ishtar_common/tests/geofla-test.csv', '--quiet',
                      stdout=out)
         # no new town
@@ -294,6 +297,7 @@ class CommandsTestCase(TestCase):
             ", " + ", ".join(reversed(union_end)) + ", 0 0, " + first + ")))"
         out = StringIO()
         call_command('import_insee_comm_csv',
+                     settings.ROOT_PATH +
                      '../ishtar_common/tests/insee-test.csv', '--quiet',
                      stdout=out)
         self.assertEqual(town_nb + 1, models.Town.objects.count())
@@ -303,6 +307,7 @@ class CommandsTestCase(TestCase):
         self.assertEqual(new.limit.wkt, union)
 
         call_command('import_insee_comm_csv', '--quiet',
+                     settings.ROOT_PATH +
                      '../ishtar_common/tests/insee-test.csv', stdout=out)
         # no new town
         self.assertEqual(town_nb + 1, models.Town.objects.count())