diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 17:02:09 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 17:02:09 +0100 |
| commit | fa105b35025742223d4238c8314287ad9e9f78a5 (patch) | |
| tree | a23858d5894be17cb2d0caa08060c66e48994837 /archaeological_finds/tests.py | |
| parent | da42af85b96513e69db706555fa6ac02b38bcaa7 (diff) | |
| parent | 4c5e12584c253b3d84abcf946cb6ce1bae8fcbcb (diff) | |
| download | Ishtar-fa105b35025742223d4238c8314287ad9e9f78a5.tar.bz2 Ishtar-fa105b35025742223d4238c8314287ad9e9f78a5.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index a1dc33dd8..cec73de8a 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -23,7 +23,6 @@ from django.conf import settings from django.contrib.auth.models import User from django.core.files.uploadedfile import SimpleUploadedFile from django.core.urlresolvers import reverse -from django.test import TestCase from django.test.client import Client from ishtar_common.models import ImporterType, IshtarUser, ImporterColumn,\ FormaterType, ImportTarget @@ -35,7 +34,8 @@ from archaeological_warehouse.models import Warehouse, WarehouseType from ishtar_common import forms_common -from ishtar_common.tests import WizardTest, WizardTestFormData as FormData +from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \ + TestCase from archaeological_operations.tests import ImportTest from archaeological_context_records.tests import ImportContextRecordTest, \ ContextRecordInit |