summaryrefslogtreecommitdiff
path: root/tests/test_django.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_django.py')
-rw-r--r--tests/test_django.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_django.py b/tests/test_django.py
index 9da99cc..113caeb 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -50,6 +50,8 @@ from . import tools
if django is not None:
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tests.djapp.settings')
+ if django.VERSION >= (1, 7, 0):
+ django.setup()
from django import test as django_test
from django.conf import settings
from django.db import models as django_models
@@ -64,8 +66,6 @@ if django is not None:
else:
django_test = unittest
-if django is not None and django.VERSION >= (1, 7, 0):
- django.setup()
test_state = {}