From 1ebeaae6d9edc1df5f7ab907c112ed69e4e14495 Mon Sep 17 00:00:00 2001
From: Sylvain Bellemare <sbellem@gmail.com>
Date: Tue, 19 Dec 2017 05:07:21 +0100
Subject: [PATCH] Closes #1736

---
 .ci/travis_script.sh | 6 +++---
 setup.cfg            | 1 +
 tox.ini              | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.ci/travis_script.sh b/.ci/travis_script.sh
index 97cfc977..58775631 100755
--- a/.ci/travis_script.sh
+++ b/.ci/travis_script.sh
@@ -8,13 +8,13 @@ elif [[ "${BIGCHAINDB_DATABASE_BACKEND}" == mongodb && \
     -z "${BIGCHAINDB_DATABASE_SSL}" ]]; then
     # Run the full suite of tests for MongoDB over an unsecure connection
   pytest -sv --database-backend=mongodb -m "serial"
-  pytest -sv --database-backend=mongodb --cov=bigchaindb -m "not serial"
+  pytest -sv --database-backend=mongodb --cov-config=setup.cfg --cov=bigchaindb -m "not serial"
 elif [[ "${BIGCHAINDB_DATABASE_BACKEND}" == mongodb && \
     "${BIGCHAINDB_DATABASE_SSL}" == true ]]; then
     # Run a sub-set of tests over SSL; those marked as 'pytest.mark.bdb_ssl'.
-  pytest -sv --database-backend=mongodb-ssl --cov=bigchaindb -m bdb_ssl
+  pytest -sv --database-backend=mongodb-ssl --cov-config=setup.cfg --cov=bigchaindb -m bdb_ssl
 else
   # Run the full suite of tests for RethinkDB (the default backend when testing)
   pytest -sv -m "serial"
-  pytest -sv --cov=bigchaindb -m "not serial"
+  pytest -sv --cov-config=setup.cfg --cov=bigchaindb -m "not serial"
 fi
diff --git a/setup.cfg b/setup.cfg
index cdec23f1..3a13192f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,7 @@ test=pytest
 [coverage:run]
 source = .
 omit = *test*
+branch = True
 
 [flake8]
 max_line_length = 119
diff --git a/tox.ini b/tox.ini
index d92c84c5..5a5ce145 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv =
 deps = {[base]deps}
 install_command = pip install {opts} {packages}
 extras = test
-commands = pytest -v -n auto --cov=bigchaindb --basetemp={envtmpdir}
+commands = pytest -v -n auto --cov-config=setup.cfg --cov=bigchaindb --basetemp={envtmpdir}
 
 [testenv:flake8]
 basepython = {[base]basepython}