From 38a959e3c829c83984efee4bb4e70e7f47b8599b Mon Sep 17 00:00:00 2001 From: Pierre Dulac Date: Sat, 2 Dec 2017 12:30:33 +0100 Subject: [PATCH] Use the Django 1.11 setup api if available --- pytest_django/plugin.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pytest_django/plugin.py b/pytest_django/plugin.py index da777965b..11bd45fdd 100644 --- a/pytest_django/plugin.py +++ b/pytest_django/plugin.py @@ -337,12 +337,21 @@ def django_test_environment(request): """ if django_settings_is_configured(): _setup_django() + from distutils.version import StrictVersion + import django from django.conf import settings as dj_settings from django.test.utils import (setup_test_environment, teardown_test_environment) if request.config.getvalue('djangodebugmode') != 'None': - dj_settings.DEBUG = bool(strtobool(request.config.getvalue('djangodebugmode'))) - setup_test_environment() + django_debug_mode = bool(strtobool(request.config.getvalue('djangodebugmode'))) + if StrictVersion(django.get_version()) >= StrictVersion('1.11'): + setup_test_environment(debug=django_debug_mode) + else: + dj_settings.DEBUG = django_debug_mode + setup_test_environment() + else: + # default setup + setup_test_environment() request.addfinalizer(teardown_test_environment)