diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-17 21:09:09 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-17 21:09:09 +0100 |
| commit | ad3ebfed01a7bb3844349b6c00e64377bde4055b (patch) | |
| tree | 121a4e7a25b8302fa4412a6066565f86dfd4733f /archaeological_context_records/tests.py | |
| parent | e2a45e2db75ec6960d458ea08004becaf429d2f6 (diff) | |
| parent | c37bb6ecce45fccc1f0c9d321a785ffeeefc3366 (diff) | |
| download | Ishtar-ad3ebfed01a7bb3844349b6c00e64377bde4055b.tar.bz2 Ishtar-ad3ebfed01a7bb3844349b6c00e64377bde4055b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0030_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py
Diffstat (limited to 'archaeological_context_records/tests.py')
| -rw-r--r-- | archaeological_context_records/tests.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index f1e6581d7..1c900184c 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -88,8 +88,9 @@ class ImportContextRecordTest(ImportTest, TestCase): self.init_cr_targetkey(impt) # Dating is not in models that can be created but force new is # set for a column that references Dating - with self.assertRaises(ImproperlyConfigured): - impt.importation() + impt.importation() + self.assertEqual(len(impt.errors), 4) + self.assertIn("doesn't exist in the database.", impt.errors[0]['error']) # retry with only Dating (no context record) for cr in models.ContextRecord.objects.all(): |