aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkotibold2011-03-15 22:57:45 +0100
committermarkotibold2011-03-15 22:57:45 +0100
commite3011c1fb8455fac58ca41acd38c32c0e791e85b (patch)
tree5b23af8ecc645d9845c1cfda1b1aa22cd7ea10b7
parent9ba66a19f814484d86e6a750b27d47b2c4e21033 (diff)
downloaddjango-rest-framework-e3011c1fb8455fac58ca41acd38c32c0e791e85b.tar.bz2
Implementing graphing.
-rw-r--r--djangorestframework/runtests/settings.py7
-rw-r--r--tox.ini8
2 files changed, 12 insertions, 3 deletions
diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py
index 2bf955aa..7acfa5f0 100644
--- a/djangorestframework/runtests/settings.py
+++ b/djangorestframework/runtests/settings.py
@@ -54,7 +54,7 @@ MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
+# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/'
# Make this unique, and don't share it with anybody.
@@ -95,3 +95,8 @@ INSTALLED_APPS = (
# 'django.contrib.admindocs',
'djangorestframework',
)
+
+TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.run_tests'
+TEST_OUTPUT_VERBOSE = True
+TEST_OUTPUT_DESCRIPTIONS = True
+TEST_OUTPUT_DIR = 'xmlrunner'
diff --git a/tox.ini b/tox.ini
index b586ab07..1b9528c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,30 +11,34 @@ basepython=python2.5
deps=
django==1.2.4
simplejson
+ unittest-xml-reporting
[testenv:py26-django12]
basepython=python2.6
deps=
django==1.2.4
+ unittest-xml-reporting
[testenv:py27-django12]
basepython=python2.7
deps=
django==1.2.4
+ unittest-xml-reporting
[testenv:py25-django13]
basepython=python2.5
deps=
http://www.djangoproject.com/download/1.3-rc-1/tarball/
simplejson
+ unittest-xml-reporting
[testenv:py26-django13]
basepython=python2.6
deps=
http://www.djangoproject.com/download/1.3-rc-1/tarball/
-
+ unittest-xml-reporting
[testenv:py27-django13]
basepython=python2.7
deps=
http://www.djangoproject.com/download/1.3-rc-1/tarball/
-
+ unittest-xml-reporting