summaryrefslogtreecommitdiff
path: root/archaeological_operations/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-06-14 00:13:06 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-06-14 00:13:06 +0200
commitee8ac4b2737d009d858360395b32b8277d4c6c3b (patch)
tree7c63d3f2e21b29c79d4c2dc6bedf91f8a64618b4 /archaeological_operations/tests.py
parent9f7e16bc051d7ae8967520c6a4ccaed00ae9cb4c (diff)
parent9fe30e305e1a114277e8473df415588bfacd188d (diff)
downloadIshtar-ee8ac4b2737d009d858360395b32b8277d4c6c3b.tar.bz2
Ishtar-ee8ac4b2737d009d858360395b32b8277d4c6c3b.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r--archaeological_operations/tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 183a2f682..924727065 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -193,7 +193,7 @@ class ImportOperationTest(ImportTest, TestCase):
# and well imported
last_ope = models.Operation.objects.order_by('-pk').all()[0]
self.assertEqual(last_ope.name, u"Oppìdum de Paris")
- self.assertEqual(last_ope.code_patriarche, 4200)
+ self.assertEqual(last_ope.code_patriarche, '4200')
self.assertEqual(last_ope.operation_type.txt_idx, 'prog_excavation')
self.assertEqual(last_ope.periods.count(), 2)
periods = [period.txt_idx for period in last_ope.periods.all()]
@@ -315,7 +315,7 @@ class ImportOperationTest(ImportTest, TestCase):
sorted([p.parcel_number for p in last_parcels]))
self.assertEqual(sections,
sorted([p.section for p in last_parcels]))
- ope1 = models.Operation.objects.filter(code_patriarche=4200).all()[0]
+ ope1 = models.Operation.objects.filter(code_patriarche='4200').all()[0]
towns_ope = ope1.towns.all()
imported = [imp for acc, imp in impt.get_all_imported()]
for p in last_parcels:
@@ -328,7 +328,7 @@ class ImportOperationTest(ImportTest, TestCase):
operation_id=ope1.pk).external_id,
'4200-59350-YY55')
# cached_label update
- ope2 = models.Operation.objects.filter(code_patriarche=4201).all()[0]
+ ope2 = models.Operation.objects.filter(code_patriarche='4201').all()[0]
self.assertIn('LILLE', ope2.cached_label.upper())
# delete associated parcel with the import deletion
parcel_count = models.Parcel.objects.count()