Enable branch coverage reporting

Additionally remove coverage files before the run, because they're not compatible with standard coverage results and could cause failures. Change-Id: I5937ed1b04bda0741b41972808107829f589ec9e
2015-11-05 16:31:44 +11:00 · 2015-11-05 16:31:44 +11:00 · c813864421
commit c813864421
parent d137dda18a
2 changed files with 4 additions and 0 deletions
--- a/.coveragerc
+++ b/.coveragerc
@ -1,3 +1,6 @@
+[run]
+branch = True
+
 [report]
 exclude_lines =
    pragma: no cover
--- a/tox.ini
+++ b/tox.ini
@ -11,6 +11,7 @@ setenv =
 deps = -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 commands =
+    coverage erase
    python setup.py testr --coverage --slowest --testr-args='{posargs}'
    coverage combine
    coverage report -m