summaryrefslogtreecommitdiff
path: root/archaeological_operations/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-06-18 01:20:56 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-06-18 01:20:56 +0200
commit6b736e9d50b56ad9eee6735d10425e00e1c3f446 (patch)
tree18c73e99e1395738657ef23541f6d78583e16b7a /archaeological_operations/tests.py
parent307520f3df65cf925609a4e66eb2628a198cabb5 (diff)
parent353f779f15a2b3fbee066eb7a7151002f19e2256 (diff)
downloadIshtar-6b736e9d50b56ad9eee6735d10425e00e1c3f446.tar.bz2
Ishtar-6b736e9d50b56ad9eee6735d10425e00e1c3f446.zip
Merge branch 'stable'
Conflicts: ishtar_common/data_importer.py
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r--archaeological_operations/tests.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index c7e75da1b..ccb67cc03 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -86,7 +86,8 @@ class ImportOperationTest(TestCase):
# doing manualy connections
tg = TargetKey.objects.filter(target__target='operation_type'
).order_by('-pk').all()[0]
- tg.value = models.OperationType.objects.get(txt_idx='prog_excavation').pk
+ tg.value = models.OperationType.objects.get(
+ txt_idx='prog_excavation').pk
tg.is_set = True
tg.save()
@@ -110,6 +111,7 @@ class ImportOperationTest(TestCase):
self.assertTrue(current_ope_nb == (first_ope_nb + 1))
# and well imported
last_ope = models.Operation.objects.order_by('-pk').all()[0]
+ self.assertEqual(last_ope.name, u"Oppìdum de Paris")
self.assertTrue(last_ope.code_patriarche == 4200)
self.assertTrue(last_ope.operation_type.txt_idx == 'prog_excavation')
self.assertEqual(last_ope.periods.count(), 2)