Merge branch 'stable'

1 files changed, 6 insertions, 3 deletions

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 2900b8786..00854ad7c 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -27,14 +27,16 @@ from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
 
-from ishtar_common.models import ImporterType, TargetKey
-from archaeological_operations.tests import OperationInitTest, ImportOperationTest
+from ishtar_common.models import ImporterType
+from archaeological_operations.tests import OperationInitTest, \
+                                            ImportOperationTest
 from archaeological_operations.models import Parcel
 from archaeological_context_records import models
 from ishtar_common import forms_common
 
 class ImportContextRecordTest(ImportOperationTest):
     test_operations = False
+    test_context_records = True
 
     fixtures = ImportOperationTest.fixtures + [
         settings.ROOT_PATH +
@@ -42,7 +44,8 @@ class ImportContextRecordTest(ImportOperationTest):
     ]
 
     def testMCCImportContextRecords(self, test=True):
-        self.testMCCImportOperation(test=False)
+        if test and not self.test_context_records:
+            return
         self.testMCCImportParcels(test=False)
 
         old_nb = models.ContextRecord.objects.count()