Merge branch 'master' into v0.9

1 files changed, 7 insertions, 8 deletions

diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 1b61d49ca..a0a9f0a8a 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -97,7 +97,7 @@ class ImportFindTest(ImportContextRecordTest):
 class FindInit(ContextRecordInit):
     test_context_records = False
 
-    def create_finds(self, user=None, data_base={}, data={}):
+    def create_finds(self, user=None, data_base={}, data={}, force=False):
         if not getattr(self, 'finds', None):
             self.finds = []
         if not getattr(self, 'base_finds', None):
@@ -106,10 +106,9 @@ class FindInit(ContextRecordInit):
         default = {'label': "Base find"}
         if not data_base.get('history_modifier'):
             data_base['history_modifier'] = self.get_default_user()
-        if not data_base.get('context_record') \
-                or not data_base['context_record'].pk:
-            data_base['context_record'] = self.get_default_context_record()
-
+        if force or not data_base.get('context_record'):
+            data_base['context_record'] = self.get_default_context_record(
+                force=force)
         default.update(data_base)
         base_find = models.BaseFind.objects.create(**default)
         self.base_finds.append(base_find)
@@ -156,7 +155,7 @@ class FindTest(FindInit, TestCase):
     model = models.Find
 
     def setUp(self):
-        self.create_finds()
+        self.create_finds(force=True)
 
     def testExternalID(self):
         find = self.finds[0]
@@ -188,8 +187,8 @@ class PackagingTest(FindInit, TestCase):
     model = models.Find
 
     def setUp(self):
-        self.create_finds({"label": u"Find 1"})
-        self.create_finds({"label": u"Find 2"})
+        self.create_finds({"label": u"Find 1"}, force=True)
+        self.create_finds({"label": u"Find 2"}, force=True)
         self.basket = models.FindBasket.objects.create(
             label="My basket", user=IshtarUser.objects.get(
                 pk=self.get_default_user().pk))