moved to pytest

lower the number of cpus used by xdist

fixed typo

foo

Author: synasius

requirements/optional.txt

@@ -1,2 +1,2 @@
 -r base.txt
-djangorestframework>=2.3
+djangorestframework>=3.3

requirements/project.txt

@@ -1,2 +1,2 @@
 -r optional.txt
-Django>=1.4
+Django>=1.7

requirements/testing.txt

@@ -1,2 +1,6 @@
 -r optional.txt
 mock==1.0.1
+pytest==2.8.3
+pytest-django==2.9.1
+pytest-xdist==1.13.1
+pytest-cov==2.2.0

runtests.py

@@ -1,10 +1,4 @@
 #!/usr/bin/env python
-import os
-import sys
+import pytest
 
-if __name__ == "__main__":
-    app_to_test = "oauth2_provider"
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "oauth2_provider.tests.settings")
-
-    from django.core.management import execute_from_command_line
-    execute_from_command_line([sys.argv[0], "test", app_to_test])
+pytest.main()

tox.ini

@@ -1,3 +1,7 @@
+[pytest]
+DJANGO_SETTINGS_MODULE=oauth2_provider.tests.settings
+testpaths=oauth2_provider
+
 [tox]
 envlist =
     {py27}-django{17,18,19},
@@ -9,13 +13,12 @@ envlist =
     flake8
 
 [testenv]
-commands=coverage run -a runtests.py
+commands=python runtests.py -q --cov oauth2_provider --cov-report= --cov-append
 deps =
     django17: Django==1.7.10
     django18: Django==1.8.6
     django19: https://www.djangoproject.com/download/1.9rc1/tarball/
-    py32: coverage<4
-    py{27,33,34,35}: coverage
+    coverage<4
     -rrequirements/testing.txt
 
 [testenv:docs]