aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkotibold2011-03-17 01:02:34 +0100
committermarkotibold2011-03-17 01:02:34 +0100
commit5f2c53bf069b308010d0698ff15e38ce3b1592b9 (patch)
tree09dd1740d1d882385dcb90bfd98343aec98ce7c9
parente3011c1fb8455fac58ca41acd38c32c0e791e85b (diff)
downloaddjango-rest-framework-5f2c53bf069b308010d0698ff15e38ce3b1592b9.tar.bz2
Test result graphing now possible for all 6 environments. Had to fix unittest-xml-reporting to work for both 1.2 and 1.3 to achieve this. The fix is reported to the owner of the project.
-rw-r--r--djangorestframework/runtests/settings.py2
-rw-r--r--tox.ini12
2 files changed, 7 insertions, 7 deletions
diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py
index 7acfa5f0..675c72bc 100644
--- a/djangorestframework/runtests/settings.py
+++ b/djangorestframework/runtests/settings.py
@@ -96,7 +96,7 @@ INSTALLED_APPS = (
'djangorestframework',
)
-TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.run_tests'
+TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
TEST_OUTPUT_VERBOSE = True
TEST_OUTPUT_DESCRIPTIONS = True
TEST_OUTPUT_DIR = 'xmlrunner'
diff --git a/tox.ini b/tox.ini
index 1b9528c1..554fea1e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,34 +11,34 @@ basepython=python2.5
deps=
django==1.2.4
simplejson
- unittest-xml-reporting
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
[testenv:py26-django12]
basepython=python2.6
deps=
django==1.2.4
- unittest-xml-reporting
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
[testenv:py27-django12]
basepython=python2.7
deps=
django==1.2.4
- unittest-xml-reporting
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
[testenv:py25-django13]
basepython=python2.5
deps=
http://www.djangoproject.com/download/1.3-rc-1/tarball/
simplejson
- unittest-xml-reporting
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
[testenv:py26-django13]
basepython=python2.6
deps=
http://www.djangoproject.com/download/1.3-rc-1/tarball/
- unittest-xml-reporting
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
[testenv:py27-django13]
basepython=python2.7
deps=
http://www.djangoproject.com/download/1.3-rc-1/tarball/
- unittest-xml-reporting
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip