From 971578ca345c3d3bae7fd93b87c41d43483b6f05 Mon Sep 17 00:00:00 2001
From: Andreas Pelme
Date: Sun, 2 Mar 2014 12:40:30 +0100
Subject: Support for running the test suite with py.test

 * Get rid of runtests.py
 * Moved test code  from rest_framework/tests and rest_framework/runtests to tests
 * Invoke py.test from setup.py
 * Invoke py.test from Travis
 * Invoke py.test from tox
 * Changed setUpClass to be just plain setUp in test_permissions.py
 * Updated contribution guideline to show how to invoke py.test
---
 tox.ini | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 77766d20..2fe39f12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,19 +3,21 @@ downloadcache = {toxworkdir}/cache/
 envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3
 
 [testenv]
-commands = {envpython} rest_framework/runtests/runtests.py
+commands = py.test -q
 
 [testenv:py3.3-django1.6]
 basepython = python3.3
 deps = Django==1.6
        django-filter==0.6a1
        defusedxml==0.3
+       pytest-django==2.6
 
 [testenv:py3.2-django1.6]
 basepython = python3.2
 deps = Django==1.6
        django-filter==0.6a1
        defusedxml==0.3
+       pytest-django==2.6
 
 [testenv:py2.7-django1.6]
 basepython = python2.7
@@ -26,6 +28,7 @@ deps = Django==1.6
        oauth2==1.5.211
        django-oauth2-provider==0.2.4
        django-guardian==1.1.1
+       pytest-django==2.6
 
 [testenv:py2.6-django1.6]
 basepython = python2.6
@@ -36,18 +39,21 @@ deps = Django==1.6
        oauth2==1.5.211
        django-oauth2-provider==0.2.4
        django-guardian==1.1.1
+       pytest-django==2.6
 
 [testenv:py3.3-django1.5]
 basepython = python3.3
 deps = django==1.5.5
        django-filter==0.6a1
        defusedxml==0.3
+       pytest-django==2.6
 
 [testenv:py3.2-django1.5]
 basepython = python3.2
 deps = django==1.5.5
        django-filter==0.6a1
        defusedxml==0.3
+       pytest-django==2.6
 
 [testenv:py2.7-django1.5]
 basepython = python2.7
@@ -58,6 +64,7 @@ deps = django==1.5.5
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
+       pytest-django==2.6
 
 [testenv:py2.6-django1.5]
 basepython = python2.6
@@ -68,6 +75,7 @@ deps = django==1.5.5
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
+       pytest-django==2.6
 
 [testenv:py2.7-django1.4]
 basepython = python2.7
@@ -78,6 +86,7 @@ deps = django==1.4.10
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
+       pytest-django==2.6
 
 [testenv:py2.6-django1.4]
 basepython = python2.6
@@ -88,6 +97,7 @@ deps = django==1.4.10
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
+       pytest-django==2.6
 
 [testenv:py2.7-django1.3]
 basepython = python2.7
@@ -98,6 +108,7 @@ deps = django==1.3.5
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
+       pytest-django==2.6
 
 [testenv:py2.6-django1.3]
 basepython = python2.6
@@ -108,3 +119,4 @@ deps = django==1.3.5
        oauth2==1.5.211
        django-oauth2-provider==0.2.3
        django-guardian==1.1.1
+       pytest-django==2.6
-- 
cgit v1.2.3