File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -336,12 +336,21 @@ def django_test_environment(request):
336336 """
337337 if django_settings_is_configured ():
338338 _setup_django ()
339+ from distutils .version import StrictVersion
340+ import django
339341 from django .conf import settings as dj_settings
340342 from django .test .utils import (setup_test_environment ,
341343 teardown_test_environment )
342344 if request .config .getvalue ('djangodebugmode' ) != 'None' :
343- dj_settings .DEBUG = bool (strtobool (request .config .getvalue ('djangodebugmode' )))
344- setup_test_environment ()
345+ django_debug_mode = bool (strtobool (request .config .getvalue ('djangodebugmode' )))
346+ if StrictVersion (django .get_version ()) >= StrictVersion ('1.11' ):
347+ setup_test_environment (debug = django_debug_mode )
348+ else :
349+ dj_settings .DEBUG = django_debug_mode
350+ setup_test_environment ()
351+ else :
352+ # default setup
353+ setup_test_environment ()
345354 request .addfinalizer (teardown_test_environment )
346355
347356
You can’t perform that action at this time.
0 commit comments