From c1ff8dd5ce20756a0ea5aa0c06104151c83c07d7 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Thu, 30 Jul 2015 11:30:06 -0700 Subject: [PATCH] Fixing coverage --- .coveragerc | 1 + .gitignore | 3 ++- tox.ini | 34 ++++++++++++++++------------------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.coveragerc b/.coveragerc index debd4e071b6..33ced9c65df 100644 --- a/.coveragerc +++ b/.coveragerc @@ -5,6 +5,7 @@ include = datastore/* localtesting/* storage/* + blog/* [report] exclude_lines = pragma: NO COVER diff --git a/.gitignore b/.gitignore index c366151b338..4cba5cd7c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ - +.coveralls.yml +coverage-gae.json *.pyc .coverage .tox diff --git a/tox.ini b/tox.ini index 057c24fa181..cf07060946e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = True -envlist = py27, pep8, cover +envlist = gae, py27, pep8 [testenv] passenv = PYTHONPATH GOOGLE_* GCLOUD_* TEST_* TRAVIS* @@ -13,28 +13,12 @@ deps = nose coverage nose-exclude - nosexcover coverargs = - --with-xunit - --with-xcoverage + --with-coverage --cover-tests --cover-branches --cover-inclusive -[testenv:py27] -deps = - {[testenv]deps} - gcloud -commands = - nosetests \ - --exclude-dir=bigquery/tests/appengine \ - --exclude-dir=bigquery/samples/appengine_auth \ - --exclude-dir=appengine \ - --exclude-dir=datastore/ndb \ - --exclude-dir=localtesting \ - {[testenv]coverargs} \ - {posargs} - [testenv:gae] deps = {[testenv]deps} @@ -51,6 +35,20 @@ commands = setenv = PYTHONPATH={env:GAE_PYTHONPATH:} +[testenv:py27] +deps = + {[testenv]deps} + gcloud +commands = + nosetests \ + --exclude-dir=bigquery/tests/appengine \ + --exclude-dir=bigquery/samples/appengine_auth \ + --exclude-dir=appengine \ + --exclude-dir=datastore/ndb \ + --exclude-dir=localtesting \ + {[testenv]coverargs} \ + {posargs} + [testenv:pep8] deps = flake8