From 344131c886762e279f61f0314010578226dca2d3 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 3 Jul 2015 00:46:50 +0200 Subject: [PATCH 1/3] Add support for coveralls. --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50dc368e4..0be0092ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,10 @@ matrix: - env: TOX_ENV=py34-djangomaster install: - - pip install tox + - pip install tox python-coveralls script: - - tox -e $TOX_ENV + - tox -e $TOX_ENV -- --cov=rest_framework + +after_success: + - coveralls From ba2bde01b6b5d9be34765986068884cc83355899 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 3 Jul 2015 00:58:40 +0200 Subject: [PATCH 2/3] Add pytest-cov to the testing requirements. --- requirements/requirements-testing.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index a8d5d3229..2753a7e7c 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,3 +1,4 @@ # PyTest for running the tests. pytest==2.6.4 pytest-django==2.8.0 +pytest-cov From f19c1458d3ff2a7234d92cdf4810af41c5f9b1fd Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 3 Jul 2015 01:19:56 +0200 Subject: [PATCH 3/3] Invoke py.test directly. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d941b6d78..ef4b4ab9e 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ envlist = {py27,py32,py33,py34}-django{17,18,master} [testenv] -commands = ./runtests.py --fast {posargs} +commands = py.test tests -q {posargs} setenv = PYTHONDONTWRITEBYTECODE=1 deps =