make tests compatible through 1.4-1.7

Author: masci

oauth2_provider/tests/__init__.py

@@ -1,15 +0,0 @@
-from .test_generator import *
-from .test_validators import *
-from .test_models import *
-from .test_mixins import *
-from .test_authorization_code import *
-from .test_implicit import *
-from .test_password import *
-from .test_client_credential import *
-from .test_scopes import *
-from .test_rest_framework import *
-from .test_application_views import *
-from .test_decorators import *
-from .test_oauth2_backends import *
-from .test_auth_backends import *
-from .test_oauth2_validators import *

oauth2_provider/tests/settings.py

@@ -120,3 +120,11 @@
 OAUTH2_PROVIDER = {
     '_SCOPES': ['example']
 }
+
+import django
+
+if django.VERSION[:2] < (1, 6):
+    TEST_RUNNER = 'discover_runner.DiscoverRunner'
+    INSTALLED_APPS += ('discover_runner',)
+else:
+    TEST_RUNNER = 'django.test.runner.DiscoverRunner'

tox.ini

@@ -16,12 +16,14 @@ deps =
 basepython = python2.6
 deps =
     Django<1.5
+    django-discover-runner
     {[testenv]deps}
 
 [testenv:py26-django15]
 basepython = python2.6
 deps =
     Django<1.6
+    django-discover-runner
     {[testenv]deps}
 
 [testenv:py26-django16]
@@ -34,12 +36,14 @@ deps =
 basepython = python2.7
 deps =
     Django<1.5
+    django-discover-runner
     {[testenv]deps}
 
 [testenv:py27-django15]
 basepython = python2.7
 deps =
     Django<1.6
+    django-discover-runner
     {[testenv]deps}
 
 [testenv:py27-django16]
@@ -58,6 +62,7 @@ deps =
 basepython = python3.3
 deps =
     Django<1.6
+    django-discover-runner
     {[testenv]deps}
 
 [testenv:py33-django16]
@@ -76,6 +81,7 @@ deps =
 basepython = python3.4
 deps =
     Django<1.6
+    django-discover-runner
     {[testenv]deps}
 
 [testenv:py34-django16]