From 9e31cab1d4ab73fa2713185d40f96617ae98f47a Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Wed, 19 Dec 2018 15:22:10 -0600
Subject: [PATCH] Fixing up tox -e cover for stx-config

In the environments that support tox -e py27
those tox.ini will also work with tox -e cover

Currently sysinv is at 34%
Currently controllerconfig is at 6%

Story: 2004515
Task: 28605
Change-Id: I9064ef7a6ca50dec749a2a5b34a03b0fd2283b4e
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
---
 .gitignore                                |  1 +
 controllerconfig/controllerconfig/tox.ini |  1 +
 sysinv/sysinv/sysinv/tox.ini              | 21 +++++++++------------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4cc85a6926..fe6fa3c632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ ChangeLog
 _build
 build
 cover
+coverage.xml
 develop-eggs
 dist
 eggs
diff --git a/controllerconfig/controllerconfig/tox.ini b/controllerconfig/controllerconfig/tox.ini
index 79310a8f9a..c50ca416b6 100644
--- a/controllerconfig/controllerconfig/tox.ini
+++ b/controllerconfig/controllerconfig/tox.ini
@@ -62,4 +62,5 @@ commands =
   coverage erase
   python setup.py testr --coverage --testr-args='{posargs}'
   coverage xml
+  coverage report
 
diff --git a/sysinv/sysinv/sysinv/tox.ini b/sysinv/sysinv/sysinv/tox.ini
index 44d3992460..fbd39cadf7 100644
--- a/sysinv/sysinv/sysinv/tox.ini
+++ b/sysinv/sysinv/sysinv/tox.ini
@@ -147,20 +147,17 @@ commands =
 [testenv:cover]
 basepython = python2.7
 deps = {[testenv]deps}
-       -e{[tox]stxdir}/stx-update/tsconfig/tsconfig
-       -e{[tox]stxdir}/stx-config/configutilities/configutilities
-       -e{[tox]stxdir}/stx-fault/fm-api
-       -e{[tox]stxdir}/stx-config/controllerconfig/controllerconfig
-       -e{[tox]stxdir}/stx-update/cgcs-patch/cgcs-patch
-       -e{[tox]stxdir}/stx-integ/utilities/platform-util/platform-util
+setenv = {[testenv]setenv}
+         PYTHON=coverage run --parallel-mode
 
 commands =
-  find . -type f -name "*.pyc" -delete
-  find . -type f -name ".coverage\.*" -delete
-  coverage erase
-  python tools/patch_tox_venv.py
-  python setup.py testr --coverage --testr-args='{posargs}'
-  coverage xml
+  {[testenv]commands}
+   coverage erase
+   stestr run {posargs}
+   coverage combine
+   coverage html -d cover
+   coverage xml -o cover/coverage.xml
+   coverage report
 
 [testenv:pip-missing-reqs]
 # do not install test-requirements as that will pollute the virtualenv for