diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/django_test_app/__init__.py | 3 | ||||
| -rw-r--r-- | tests/test_django.py | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/django_test_app/__init__.py b/tests/django_test_app/__init__.py index 2cc3e27..72ebf68 100644 --- a/tests/django_test_app/__init__.py +++ b/tests/django_test_app/__init__.py @@ -21,7 +21,8 @@ if django_loaded: # pragma: no cover }, INSTALLED_APPS=[ 'tests.django_test_app', - ] + ], + MIDDLEWARE_CLASSES=[], ) # https://docs.djangoproject.com/en/dev/releases/1.7/#app-loading-changes if django.VERSION >= (1, 7): diff --git a/tests/test_django.py b/tests/test_django.py index 6de1e7a..94e2420 100644 --- a/tests/test_django.py +++ b/tests/test_django.py @@ -179,11 +179,10 @@ class SouthTestCase(unittest.TestCase): if django_loaded: from django.test import TestCase - try: - from django.test.runner import DiscoverRunner as TestRunner - except ImportError: - # django < 1.6 + if django.VERSION[:2] < (1, 6): from django.test.simple import DjangoTestSuiteRunner as TestRunner + else: + from django.test.runner import DiscoverRunner as TestRunner class DbInteractingTestCase(TestCase): |