Skip to content

Commit

Permalink
Implementing graphing.
Browse files Browse the repository at this point in the history
  • Loading branch information
markotibold committed Mar 15, 2011
1 parent 9ba66a1 commit e3011c1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
7 changes: 6 additions & 1 deletion djangorestframework/runtests/settings.py
Expand Up @@ -54,7 +54,7 @@

# 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.
Expand Down Expand Up @@ -95,3 +95,8 @@
# 'django.contrib.admindocs',
'djangorestframework',
)

TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.run_tests'
TEST_OUTPUT_VERBOSE = True
TEST_OUTPUT_DESCRIPTIONS = True
TEST_OUTPUT_DIR = 'xmlrunner'
8 changes: 6 additions & 2 deletions tox.ini
Expand Up @@ -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

0 comments on commit e3011c1

Please sign in to comment.