diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-22 18:19:24 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-22 18:19:24 +0200 |
commit | f27717948fa4b5c3beda333fd75aaf63ef533d9a (patch) | |
tree | fb991886d246e1267bdfbb9c23a2f51e28cf214a /ishtar_common/tests.py | |
parent | eeab674b10b2fca2a4660a99202aa2dd07ee5594 (diff) | |
download | Ishtar-f27717948fa4b5c3beda333fd75aaf63ef533d9a.tar.bz2 Ishtar-f27717948fa4b5c3beda333fd75aaf63ef533d9a.zip |
Fix tests
Diffstat (limited to 'ishtar_common/tests.py')
-rw-r--r-- | ishtar_common/tests.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 6f393a7e3..af2dee047 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -19,6 +19,8 @@ from bs4 import BeautifulSoup as Soup import datetime +import os +import shutil from StringIO import StringIO from django.conf import settings @@ -26,7 +28,7 @@ from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.core.cache import cache from django.core.exceptions import ValidationError -from django.core.files.base import File as DjangoFile +from django.core.files import File as DjangoFile from django.core.management import call_command from django.core.urlresolvers import reverse from django.template.defaultfilters import slugify @@ -861,10 +863,14 @@ class ImportTest(TestCase): klass='ishtar_common.models.Person', name='Person') importer_type = models.ImporterType.objects.create( associated_models=imp_model) - mcc_operation_file = DjangoFile(file( + + dest = os.path.join(settings.MEDIA_ROOT, "MCC-operations-example.csv") + shutil.copy( settings.ROOT_PATH + '../archaeological_operations/tests/MCC-operations-example.csv', - 'rb')) + dest + ) + mcc_operation_file = DjangoFile(file(dest, 'rb')) imprt = models.Import.objects.create( user=models.IshtarUser.objects.all()[0], importer_type=importer_type, |