Merge pull request #202 from blueyed/coverage-subprocess

coverage: track subprocesses
jazzband · Aug 16, 2018 · 52a8632 · 52a8632
2 parents b2d27dc + 89cdca0
commit 52a8632
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-.coverage
+.coverage.*
+coverage.xml
+sitecustomize.py
 docs/_build
 *.egg-info
 *.egg

diff --git a/.travis.yml b/.travis.yml
@@ -64,7 +64,6 @@ after_success:
   if [[ "$TOXENV" = py* ]]; then
     pip install codecov
     coverage xml
-    coverage report -m
     codecov --required -X gcov fix pycov -f coverage.xml --flags ${TOXENV//-/ }
   fi
 branches:

diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 1
 
 [coverage:run]
 source = .
-include = configurations/*,tests/*
 branch = 1
+parallel = 1
 [coverage:report]
 include = configurations/*,tests/*
diff --git a/tox.ini b/tox.ini
@@ -16,6 +16,7 @@ usedevelop = true
 setenv =
     DJANGO_SETTINGS_MODULE = tests.settings.main
     DJANGO_CONFIGURATION = Test
+    COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
 deps =
     -rtests/requirements.txt
     dj18: django>=1.8,<1.9
@@ -28,7 +29,8 @@ deps =
 commands =
     python --version
     coverage run {envbindir}/django-cadmin test -v2 {posargs:tests}
-    coverage report
+    coverage combine
+    coverage report -m --skip-covered
 
 [testenv:readme-py27]
 commands = python setup.py check -r -s