From 13a0740db5fa109f74ffbaf69528ee82f91b4f45 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 29 Jan 2020 18:54:19 +0100 Subject: Fix tests for setup.py runtests --- ishtar_common/tests.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'ishtar_common/tests.py') 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()) -- cgit v1.2.3