summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikela Clemmons <glassresistor@gmail.com>2014-09-21 17:42:27 (GMT)
committerMikela Clemmons <glassresistor@gmail.com>2014-09-21 17:42:27 (GMT)
commit4269205c3f28c02e54da00b658863f2a81a3f62d (patch)
tree191817fea15bcf8f9443fc74fa22d1ae38ab4e8f
parent6b1bc44fa2efcafaccdfdb0e4c6cef483fd2efc3 (diff)
downloaddjango-oauth2-provider-master.zip
django-oauth2-provider-master.tar.gz
django-oauth2-provider-master.tar.bz2
added DiscoverRunner for django 1.7 and aboveHEADmaster
-rw-r--r--tests/settings.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/settings.py b/tests/settings.py
index ff4d1d6..b689fcc 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -1,5 +1,6 @@
# Django settings for example project.
import os
+from django import VERSION as DJANGO_VERSION
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@ -68,3 +69,8 @@ MIDDLEWARE_CLASSES = (
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
+
+# Use DiscoverRunner on Django 1.7 and above
+if DJANGO_VERSION[0] == 1 and DJANGO_VERSION[1] >= 7:
+ TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+