Skip to content

Commit 38a959e

Browse files
committed
Use the Django 1.11 setup api if available
1 parent aa45a06 commit 38a959e

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

pytest_django/plugin.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,21 @@ def django_test_environment(request):
337337
"""
338338
if django_settings_is_configured():
339339
_setup_django()
340+
from distutils.version import StrictVersion
341+
import django
340342
from django.conf import settings as dj_settings
341343
from django.test.utils import (setup_test_environment,
342344
teardown_test_environment)
343345
if request.config.getvalue('djangodebugmode') != 'None':
344-
dj_settings.DEBUG = bool(strtobool(request.config.getvalue('djangodebugmode')))
345-
setup_test_environment()
346+
django_debug_mode = bool(strtobool(request.config.getvalue('djangodebugmode')))
347+
if StrictVersion(django.get_version()) >= StrictVersion('1.11'):
348+
setup_test_environment(debug=django_debug_mode)
349+
else:
350+
dj_settings.DEBUG = django_debug_mode
351+
setup_test_environment()
352+
else:
353+
# default setup
354+
setup_test_environment()
346355
request.addfinalizer(teardown_test_environment)
347356

348357

0 commit comments

Comments
 (0)