diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-27 00:01:03 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-27 00:01:03 +0200 |
commit | a3abe56e296ce4385478c27b5573b4c4ea10765f (patch) | |
tree | 19bd7230a7192fa3d69cf3804173cca868f1c0f2 /archaeological_operations/tests.py | |
parent | c697536ba152909f43d0166debc030390af66fc0 (diff) | |
parent | fe1f68b1bff3908f87436d36532499677de07bcc (diff) | |
download | Ishtar-a3abe56e296ce4385478c27b5573b4c4ea10765f.tar.bz2 Ishtar-a3abe56e296ce4385478c27b5573b4c4ea10765f.zip |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r-- | archaeological_operations/tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 983165968..0a48f4d4a 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -31,9 +31,9 @@ import models from ishtar_common.models import OrganizationType, Organization, Town class ImportOperationTest(TestCase): - fixtures = ['../ishtar_common/fixtures/initial_data.json', - '../archaeological_files/fixtures/initial_data.json', - '../archaeological_operations/fixtures/initial_data-fr.json'] + fixtures = [settings.ROOT_PATH + '../ishtar_common/fixtures/initial_data.json', + settings.ROOT_PATH + '../archaeological_files/fixtures/initial_data.json', + settings.ROOT_PATH + '../archaeological_operations/fixtures/initial_data-fr.json'] def setUp(self): user = User.objects.create_user('username') |