Skip to content

Commit 358f8a2

Browse files
author
Jonathan Wayne Parrott
committed
Merge pull request #63 from GoogleCloudPlatform/coverage-fix
Fixing coverage
2 parents 448a819 + c1ff8dd commit 358f8a2

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ include =
55
datastore/*
66
localtesting/*
77
storage/*
8+
blog/*
89
[report]
910
exclude_lines =
1011
pragma: NO COVER

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
1+
.coveralls.yml
2+
coverage-gae.json
23
*.pyc
34
.coverage
45
.tox

tox.ini

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
skipsdist = True
3-
envlist = py27, pep8, cover
3+
envlist = gae, py27, pep8
44

55
[testenv]
66
passenv = PYTHONPATH GOOGLE_* GCLOUD_* TEST_* TRAVIS*
@@ -13,28 +13,12 @@ deps =
1313
nose
1414
coverage
1515
nose-exclude
16-
nosexcover
1716
coverargs =
18-
--with-xunit
19-
--with-xcoverage
17+
--with-coverage
2018
--cover-tests
2119
--cover-branches
2220
--cover-inclusive
2321

24-
[testenv:py27]
25-
deps =
26-
{[testenv]deps}
27-
gcloud
28-
commands =
29-
nosetests \
30-
--exclude-dir=bigquery/tests/appengine \
31-
--exclude-dir=bigquery/samples/appengine_auth \
32-
--exclude-dir=appengine \
33-
--exclude-dir=datastore/ndb \
34-
--exclude-dir=localtesting \
35-
{[testenv]coverargs} \
36-
{posargs}
37-
3822
[testenv:gae]
3923
deps =
4024
{[testenv]deps}
@@ -51,6 +35,20 @@ commands =
5135
setenv =
5236
PYTHONPATH={env:GAE_PYTHONPATH:}
5337

38+
[testenv:py27]
39+
deps =
40+
{[testenv]deps}
41+
gcloud
42+
commands =
43+
nosetests \
44+
--exclude-dir=bigquery/tests/appengine \
45+
--exclude-dir=bigquery/samples/appengine_auth \
46+
--exclude-dir=appengine \
47+
--exclude-dir=datastore/ndb \
48+
--exclude-dir=localtesting \
49+
{[testenv]coverargs} \
50+
{posargs}
51+
5452
[testenv:pep8]
5553
deps =
5654
flake8

0 commit comments

Comments
 (0)