diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:43:14 +0200 |
| commit | 9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39 (patch) | |
| tree | 3bbb30e8d51acc9d52083be6b21c2bdcfd2f5fdc /archaeological_finds/tests.py | |
| parent | 73afc7f761b29a1404cdf567e1880816abcb96aa (diff) | |
| parent | 08f1fe99d11e40ca506469c1d782791fca18d49d (diff) | |
| download | Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.tar.bz2 Ishtar-9ebf429a92a8fa0dd04df6cdd51caa2ef1c58c39.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 15 |
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)) |