File tree 1 file changed +11
-2
lines changed
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):
336
336
"""
337
337
if django_settings_is_configured ():
338
338
_setup_django ()
339
+ from distutils .version import StrictVersion
340
+ import django
339
341
from django .conf import settings as dj_settings
340
342
from django .test .utils import (setup_test_environment ,
341
343
teardown_test_environment )
342
344
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 ()
345
354
request .addfinalizer (teardown_test_environment )
346
355
347
356
You can’t perform that action at this time.
0 commit comments