Merge branch 'v0.9' into wheezy

1 files changed, 6 insertions, 6 deletions

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 27ba0ab71..9b8d4f000 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -90,14 +90,14 @@ class ImportContextRecordTest(ImportOperationTest):
 class ContextRecordInit(OperationInitTest):
     test_operations = False
 
-    def create_context_record(self, user=None, data={}):
+    def create_context_record(self, user=None, data={}, force=False):
         if not getattr(self, 'context_records', None):
             self.context_records = []
 
         default = {'label': "Context record"}
-        if not data.get('operation'):
-            data['operation'] = self.get_default_operation()
-        if not data.get('parcel'):
+        if force or not data.get('operation'):
+            data['operation'] = self.get_default_operation(force=force)
+        if not data.get('parcel') or not data['parcel'].pk:
             data['parcel'] = self.get_default_parcel()
         if not data.get('history_modifier'):
             data['history_modifier'] = self.get_default_user()
@@ -107,8 +107,8 @@ class ContextRecordInit(OperationInitTest):
             **default))
         return self.context_records
 
-    def get_default_context_record(self):
-        return self.create_context_record()[0]
+    def get_default_context_record(self, force=False):
+        return self.create_context_record(force=force)[0]
 
     def tearDown(self):
         if hasattr(self, 'context_records'):