File tree 1 file changed +11
-3
lines changed
1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -471,13 +471,21 @@ def django_test_environment(request):
471
471
"""
472
472
if django_settings_is_configured ():
473
473
_setup_django ()
474
+ from distutils .version import StrictVersion
475
+ import django
474
476
from django .conf import settings as dj_settings
475
477
from django .test .utils import setup_test_environment , teardown_test_environment
476
478
477
479
if request .config .getvalue ('djangodebugmode' ) != 'None' :
478
- dj_settings .DEBUG = bool (strtobool (request .config .getvalue ('djangodebugmode' )))
479
-
480
- setup_test_environment ()
480
+ django_debug_mode = bool (strtobool (request .config .getvalue ('djangodebugmode' )))
481
+ if StrictVersion (django .get_version ()) >= StrictVersion ('1.11' ):
482
+ setup_test_environment (debug = django_debug_mode )
483
+ else :
484
+ dj_settings .DEBUG = django_debug_mode
485
+ setup_test_environment ()
486
+ else :
487
+ # default setup
488
+ setup_test_environment ()
481
489
request .addfinalizer (teardown_test_environment )
482
490
483
491
You can’t perform that action at this time.
0 commit comments