diff --git a/.hgignore b/.hgignore index 436c0c483..1b63b944b 100644 --- a/.hgignore +++ b/.hgignore @@ -3,6 +3,7 @@ syntax: glob *.pyc *.db *~ +coverage.xml env docs/build html diff --git a/djangorestframework/runtests/runcoverage.py b/djangorestframework/runtests/runcoverage.py index 1deb10805..948d78891 100644 --- a/djangorestframework/runtests/runcoverage.py +++ b/djangorestframework/runtests/runcoverage.py @@ -47,6 +47,7 @@ def main(): cov.stop() cov.report(cov_files) + cov.xml_report(cov_files) sys.exit(failures) if __name__ == '__main__': diff --git a/setup.py b/setup.py index 4c5ff054e..1aa6e1908 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( 'djangorestframework.runtests'], package_dir={'djangorestframework': 'djangorestframework'}, package_data = {'djangorestframework': ['templates/*', 'static/*']}, - test_suite = 'djangorestframework.runtests.runtests.main', + test_suite = 'djangorestframework.runtests.runcoverage.main', classifiers = [ 'Development Status :: 4 - Beta', 'Environment :: Web Environment', diff --git a/tox.ini b/tox.ini index 554fea1e5..a58c39800 100644 --- a/tox.ini +++ b/tox.ini @@ -11,18 +11,21 @@ basepython=python2.5 deps= django==1.2.4 simplejson + coverage==3.4 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 + coverage==3.4 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 + coverage==3.4 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip [testenv:py25-django13] @@ -30,15 +33,19 @@ basepython=python2.5 deps= http://www.djangoproject.com/download/1.3-rc-1/tarball/ simplejson + coverage==3.4 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/ + coverage==3.4 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/ + coverage==3.4 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip