Merge pull request #372 from mattbennett/branch-coverage

add branch coverage as an allowed failure
nameko · Oct 28, 2016 · 7809578 · 7809578
2 parents 4f80099 + dc1c237
commit 7809578
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,6 +1,7 @@
 [run]
 concurrency = eventlet
 parallel = true
+branch = ${BRANCH}
 data_file = /tmp/.coverage
 source =
     nameko

diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ env:
   - TOX_ENV=py34-pinned-lib
   - TOX_ENV=py34-latest-lib
   - TOX_ENV=py34-mastereventlet-lib
+  - TOX_ENV=py34-branchcoverage-lib
   - TOX_ENV=py34-examples
   - TOX_ENV=docs
 
@@ -39,6 +40,7 @@ matrix:
     - env: TOX_ENV=py27-mastereventlet-lib
     - env: TOX_ENV=py33-mastereventlet-lib
     - env: TOX_ENV=py34-mastereventlet-lib
+    - env: TOX_ENV=py34-branchcoverage-lib
 
 script:
   - tox -e $TOX_ENV

diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 .PHONY: test docs
 
+ENABLE_BRANCH_COVERAGE ?= 0
+
 test: flake8 pylint test_lib test_examples
 
 flake8:
@@ -9,10 +11,10 @@ pylint:
 	pylint --rcfile=pylintrc nameko -E
 
 test_lib:
-	py.test test --cov --cov-config=$(CURDIR)/.coveragerc
+	BRANCH=$(ENABLE_BRANCH_COVERAGE) py.test test --cov --cov-config=$(CURDIR)/.coveragerc
 
 test_examples:
-	py.test docs/examples/test --cov=docs/examples
+	BRANCH=$(ENABLE_BRANCH_COVERAGE) py.test docs/examples/test --cov=docs/examples --cov-config=$(CURDIR)/.coveragerc
 	py.test docs/examples/testing
 
 test_docs: docs spelling #linkcheck

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py33,py34}-{oldest,pinned,latest,mastereventlet}-lib, py34-examples, docs
+envlist = {py27,py33,py34}-{oldest,pinned,latest,mastereventlet}-lib, py34-branchcoverage-lib, py34-examples, docs
 skipsdist = True
 
 [testenv]
@@ -25,6 +25,10 @@ deps =
     pinned: six==1.9.0
     pinned: werkzeug==0.9.6
 
+setenv =
+    branchcoverage: ENABLE_BRANCH_COVERAGE=1
+    examples: ENABLE_BRANCH_COVERAGE=1
+
 whitelist_externals = make
 
 commands =