From 1526e63c9da5b9d87364d9a372d59b3a69203912 Mon Sep 17 00:00:00 2001
From: Steve Heyman <steve.heyman@rackspace.com>
Date: Mon, 6 Jan 2014 11:50:39 -0600
Subject: [PATCH] Enabled branch coverage for barbican.  Took out inclusive
 coverage.

Change-Id: Ie81ba92103e35962f5e85b1442237d6617f44736
---
 setup.cfg | 3 ++-
 tox.ini   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 23ce1af67..58856f2ac 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -66,7 +66,8 @@ cover-erase=1
 #-traverse-namespace=1
 #with-coverage=1
 cover-package=barbican
-#-cover-inclusive=1
+#cover-inclusive=1
+cover-branches=1
 
 # TBD: OpenStack stuff...
 # NOTE(jkoelker) To run the test suite under nose install the following
diff --git a/tox.ini b/tox.ini
index 55f50224f..fbaae3d4a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
 [testenv:py27]
-commands = nosetests {posargs:--with-xcoverage --all-modules --cover-inclusive --traverse-namespace --with-xunit --cover-package=barbican}
+commands = nosetests {posargs:--with-xcoverage --all-modules --traverse-namespace --with-xunit --cover-package=barbican}
 
 [testenv:coverage]
 commands = coverage html {posargs:--include="*barbican*"}