Move tests outside of the oauth2_provider package

jleclanche · jleclanche · commit e59049301b57 · 2017-03-09T08:40:21.000+02:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -20,7 +20,7 @@
 sys.path.insert(0, here)
 sys.path.insert(0, os.path.dirname(here))
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'oauth2_provider.tests.settings'
+os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings"
 
 import django
 django.setup()
diff --git a/runtests.py b/runtests.py
diff --git a/setup.py b/setup.py
@@ -3,4 +3,4 @@
 from setuptools import setup
 
 
-setup(test_suite="runtests")
+setup()
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/models.py b/tests/models.py
diff --git a/tests/settings.py b/tests/settings.py
@@ -67,7 +67,7 @@
 # Django < 1.10 compatibility
 MIDDLEWARE_CLASSES = MIDDLEWARE
 
-ROOT_URLCONF = 'oauth2_provider.tests.urls'
+ROOT_URLCONF = 'tests.urls'
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -78,7 +78,7 @@
     'django.contrib.admin',
 
     'oauth2_provider',
-    'oauth2_provider.tests',
+    'tests',
 )
 
 LOGGING = {
diff --git a/tests/test_application_views.py b/tests/test_application_views.py
@@ -3,8 +3,12 @@
 from django.contrib.auth import get_user_model
 from django.test import TestCase
 
-from ..compat import reverse
-from ..models import get_application_model
+from oauth2_provider.compat import reverse
+from oauth2_provider.models import get_application_model
+from oauth2_provider.views.application import ApplicationRegistration
+from oauth2_provider.settings import oauth2_settings
+
+from .models import TestApplication
 
 
 Application = get_application_model()
@@ -28,9 +32,6 @@ def test_get_form_class(self):
         bound to custom application model defined in the
         'OAUTH2_PROVIDER_APPLICATION_MODEL' setting.
         """
-        from ..views.application import ApplicationRegistration
-        from .models import TestApplication
-        from ..settings import oauth2_settings
         # Patch oauth2 settings to use a custom Application model
         oauth2_settings.APPLICATION_MODEL = 'tests.TestApplication'
         # Create a registration view and tests that the model form is bound
diff --git a/tests/test_auth_backends.py b/tests/test_auth_backends.py
@@ -5,10 +5,10 @@
 from django.utils.timezone import now, timedelta
 from django.http import HttpResponse
 
-from ..models import get_application_model
-from ..models import AccessToken
-from ..backends import OAuth2Backend
-from ..middleware import OAuth2TokenMiddleware
+from oauth2_provider.models import get_application_model
+from oauth2_provider.models import AccessToken
+from oauth2_provider.backends import OAuth2Backend
+from oauth2_provider.middleware import OAuth2TokenMiddleware
 try:
     # Django<1.10 compatibility
     from django.conf.global_settings import MIDDLEWARE_CLASSES as MIDDLEWARE
diff --git a/tests/test_authorization_code.py b/tests/test_authorization_code.py
@@ -8,10 +8,10 @@
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
 
-from ..compat import parse_qs, reverse, urlparse, urlencode
-from ..models import get_application_model, Grant, AccessToken, RefreshToken
-from ..settings import oauth2_settings
-from ..views import ProtectedResourceView
+from oauth2_provider.compat import parse_qs, reverse, urlparse, urlencode
+from oauth2_provider.models import get_application_model, Grant, AccessToken, RefreshToken
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.views import ProtectedResourceView
 
 from .test_utils import TestCaseUtils
 
diff --git a/tests/test_client_credential.py b/tests/test_client_credential.py
@@ -13,13 +13,13 @@
 
 from oauthlib.oauth2 import BackendApplicationServer
 
-from ..compat import reverse
-from ..models import get_application_model, AccessToken
-from ..oauth2_backends import OAuthLibCore
-from ..oauth2_validators import OAuth2Validator
-from ..settings import oauth2_settings
-from ..views import ProtectedResourceView
-from ..views.mixins import OAuthLibMixin
+from oauth2_provider.compat import reverse
+from oauth2_provider.models import get_application_model, AccessToken
+from oauth2_provider.oauth2_backends import OAuthLibCore
+from oauth2_provider.oauth2_validators import OAuth2Validator
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.views import ProtectedResourceView
+from oauth2_provider.views.mixins import OAuthLibMixin
 from .test_utils import TestCaseUtils
 
 
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
@@ -4,9 +4,9 @@
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
 
-from ..decorators import protected_resource, rw_protected_resource
-from ..settings import oauth2_settings
-from ..models import get_application_model, AccessToken
+from oauth2_provider.decorators import protected_resource, rw_protected_resource
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.models import get_application_model, AccessToken
 from .test_utils import TestCaseUtils
 
 
diff --git a/tests/test_generator.py b/tests/test_generator.py
@@ -2,9 +2,11 @@
 
 from django.test import TestCase
 
-from ..settings import oauth2_settings
-from ..generators import (BaseHashGenerator, ClientIdGenerator, ClientSecretGenerator,
-                          generate_client_id, generate_client_secret)
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.generators import (
+    BaseHashGenerator, ClientIdGenerator, ClientSecretGenerator,
+    generate_client_id, generate_client_secret
+)
 
 
 class MockHashGenerator(BaseHashGenerator):
diff --git a/tests/test_implicit.py b/tests/test_implicit.py
@@ -3,10 +3,10 @@
 from django.contrib.auth import get_user_model
 from django.test import TestCase, RequestFactory
 
-from ..compat import parse_qs, reverse, urlparse, urlencode
-from ..models import get_application_model
-from ..settings import oauth2_settings
-from ..views import ProtectedResourceView
+from oauth2_provider.compat import parse_qs, reverse, urlparse, urlencode
+from oauth2_provider.models import get_application_model
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.views import ProtectedResourceView
 
 
 Application = get_application_model()
diff --git a/tests/test_mixins.py b/tests/test_mixins.py
@@ -6,9 +6,9 @@
 
 from oauthlib.oauth2 import Server
 
-from ..views.mixins import OAuthLibMixin, ScopedResourceMixin, ProtectedResourceMixin
-from ..oauth2_backends import OAuthLibCore
-from ..oauth2_validators import OAuth2Validator
+from oauth2_provider.views.mixins import OAuthLibMixin, ScopedResourceMixin, ProtectedResourceMixin
+from oauth2_provider.oauth2_backends import OAuthLibCore
+from oauth2_provider.oauth2_validators import OAuth2Validator
 
 
 class BaseTest(TestCase):
diff --git a/tests/test_models.py b/tests/test_models.py
@@ -7,7 +7,7 @@
 from django.test.utils import override_settings
 from django.utils import timezone
 
-from ..models import get_application_model, Grant, AccessToken, RefreshToken
+from oauth2_provider.models import get_application_model, Grant, AccessToken, RefreshToken
 
 
 Application = get_application_model()
diff --git a/tests/test_oauth2_backends.py b/tests/test_oauth2_backends.py
@@ -3,8 +3,8 @@
 
 from django.test import TestCase, RequestFactory
 
-from ..backends import get_oauthlib_core
-from ..oauth2_backends import OAuthLibCore, JSONOAuthLibCore
+from oauth2_provider.backends import get_oauthlib_core
+from oauth2_provider.oauth2_backends import OAuthLibCore, JSONOAuthLibCore
 
 
 class TestOAuthLibCoreBackend(TestCase):
diff --git a/tests/test_oauth2_validators.py b/tests/test_oauth2_validators.py
@@ -7,9 +7,9 @@
 import mock
 from oauthlib.common import Request
 
-from ..exceptions import FatalClientError
-from ..oauth2_validators import OAuth2Validator
-from ..models import get_application_model, AccessToken, RefreshToken
+from oauth2_provider.exceptions import FatalClientError
+from oauth2_provider.oauth2_validators import OAuth2Validator
+from oauth2_provider.models import get_application_model, AccessToken, RefreshToken
 
 UserModel = get_user_model()
 AppModel = get_application_model()
diff --git a/tests/test_password.py b/tests/test_password.py
@@ -5,10 +5,10 @@
 from django.contrib.auth import get_user_model
 from django.test import TestCase, RequestFactory
 
-from ..compat import reverse
-from ..models import get_application_model
-from ..settings import oauth2_settings
-from ..views import ProtectedResourceView
+from oauth2_provider.compat import reverse
+from oauth2_provider.models import get_application_model
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.views import ProtectedResourceView
 from .test_utils import TestCaseUtils
 
 
diff --git a/tests/test_rest_framework.py b/tests/test_rest_framework.py
@@ -9,8 +9,8 @@
 from django.utils import timezone
 
 from .test_utils import TestCaseUtils
-from ..models import AccessToken, get_application_model
-from ..settings import oauth2_settings
+from oauth2_provider.models import AccessToken, get_application_model
+from oauth2_provider.settings import oauth2_settings
 
 
 Application = get_application_model()
@@ -21,8 +21,10 @@
     from rest_framework import permissions
     from rest_framework.views import APIView
     from rest_framework.test import force_authenticate, APIRequestFactory
-    from ..ext.rest_framework import OAuth2Authentication, TokenHasScope, TokenHasReadWriteScope, TokenHasResourceScope
-    from ..ext.rest_framework import IsAuthenticatedOrTokenHasScope
+    from oauth2_provider.ext.rest_framework import (
+        IsAuthenticatedOrTokenHasScope, OAuth2Authentication, TokenHasScope,
+        TokenHasReadWriteScope, TokenHasResourceScope
+    )
 
     class MockView(APIView):
         permission_classes = (permissions.IsAuthenticated,)
diff --git a/tests/test_scopes.py b/tests/test_scopes.py
@@ -7,10 +7,10 @@
 from django.test import TestCase, RequestFactory
 
 from .test_utils import TestCaseUtils
-from ..compat import parse_qs, reverse, urlparse
-from ..models import get_application_model, Grant, AccessToken
-from ..settings import oauth2_settings
-from ..views import ScopedProtectedResourceView, ReadWriteScopedResourceView
+from oauth2_provider.compat import parse_qs, reverse, urlparse
+from oauth2_provider.models import get_application_model, Grant, AccessToken
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.views import ScopedProtectedResourceView, ReadWriteScopedResourceView
 
 
 Application = get_application_model()
diff --git a/tests/test_scopes_backend.py b/tests/test_scopes_backend.py
diff --git a/tests/test_token_revocation.py b/tests/test_token_revocation.py
@@ -6,9 +6,9 @@
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
 
-from ..compat import reverse, urlencode
-from ..models import get_application_model, AccessToken, RefreshToken
-from ..settings import oauth2_settings
+from oauth2_provider.compat import reverse, urlencode
+from oauth2_provider.models import get_application_model, AccessToken, RefreshToken
+from oauth2_provider.settings import oauth2_settings
 
 from .test_utils import TestCaseUtils
 
diff --git a/tests/test_token_view.py b/tests/test_token_view.py
@@ -6,8 +6,8 @@
 from django.test import TestCase
 from django.utils import timezone
 
-from ..compat import reverse
-from ..models import get_application_model, AccessToken
+from oauth2_provider.compat import reverse
+from oauth2_provider.models import get_application_model, AccessToken
 
 
 Application = get_application_model()
diff --git a/tests/test_utils.py b/tests/test_utils.py
diff --git a/tests/test_validators.py b/tests/test_validators.py
@@ -3,8 +3,8 @@
 from django.test import TestCase
 from django.core.validators import ValidationError
 
-from ..settings import oauth2_settings
-from ..validators import validate_uris
+from oauth2_provider.settings import oauth2_settings
+from oauth2_provider.validators import validate_uris
 
 
 class TestValidators(TestCase):
diff --git a/tests/urls.py b/tests/urls.py
diff --git a/tox.ini b/tox.ini
@@ -1,38 +1,34 @@
-[pytest]
-DJANGO_SETTINGS_MODULE=oauth2_provider.tests.settings
-testpaths=oauth2_provider
-
 [tox]
 envlist =
-    py27-django{18,19,110,111},
-    py35-django{18,19,110,111,master},
-    py36-djangomaster,
-    docs,
-    flake8
+	py27-django{18,19,110,111},
+	py35-django{18,19,110,111,master},
+	py36-djangomaster,
+	docs,
+	flake8
 
 [testenv]
-commands=python runtests.py -q --cov=oauth2_provider --cov-report= --cov-append
+commands = pytest --cov=oauth2_provider --cov-report= --cov-append
+setenv =
+	DJANGO_SETTINGS_MODULE=tests.settings
+	PYTHONPATH={toxinidir}
 deps =
-    django18: Django==1.8.17
-    django19: Django==1.9.12
-    django110: Django==1.10.5
-    django111: Django==1.11b1
-    djangomaster: https://github.com/django/django/archive/master.tar.gz
-    -rrequirements/testing.txt
+	django18: Django==1.8.17
+	django19: Django==1.9.12
+	django110: Django==1.10.5
+	django111: Django==1.11b1
+	djangomaster: https://github.com/django/django/archive/master.tar.gz
+	-rrequirements/testing.txt
 
 [testenv:docs]
-basepython=python
-changedir=docs
-whitelist_externals=make
-deps =
-    sphinx
-commands=make html
+basepython = python
+changedir = docs
+whitelist_externals = make
+deps = sphinx
+commands = make html
 
 [testenv:flake8]
-deps =
-    flake8
-commands =
-    flake8 oauth2_provider
+deps = flake8
+commands = flake8 oauth2_provider
 
 [flake8]
 max-line-length = 120

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`from setuptools import setup`
`4`	`4`
`5`	`5`
`6`		`-setup(test_suite="runtests")`
	`6`	`+setup()`