Fix tests

2 files changed, 10 insertions, 4 deletions

diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 80c8656a7..49cec3640 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -1240,7 +1240,7 @@ class OperationWizardCreationTest(WizardTest, OperationInitTest, TestCase):
         self.assertEqual(models.Operation.objects.count(),
                          self.operation_number + 3)
         self.assertEqual(models.Parcel.objects.count(),
-                         self.parcel_number + 3)
+                         self.parcel_number + 2)
 
 
 class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
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,