2 files changed, 40 insertions, 7 deletions
diff --git a/dcae-policy/tox-local.ini b/dcae-policy/tox-local.ini
index d3ffbb0..125233e 100644
--- a/dcae-policy/tox-local.ini
+++ b/dcae-policy/tox-local.ini
@@ -1,8 +1,12 @@
-# tox -c tox-local.ini | tee -a logs/test_dcaepolicyplugin.log 2>&1
+# tox -c tox-local.ini
 [tox]
-envlist = py27,py36
+envlist = py27,py36,cov
 
 [testenv]
+# coverage can only find modules if pythonpath is set
+setenv=
+    PYTHONPATH={toxinidir}
+    COVERAGE_FILE=.coverage.{envname}
 deps=
     -rrequirements.txt
     pytest
@@ -10,7 +14,20 @@ deps=
     pytest-cov
 whitelist_externals=
     /bin/mkdir
-# recreate = True
 commands=
     mkdir -p logs
-    pytest -v --cov dcaepolicyplugin --cov-report html
+    coverage erase
+    pytest --junitxml xunit-results.{envname}.xml --cov dcaepolicyplugin
+
+[testenv:cov]
+skip_install = true
+deps=
+    coverage
+setenv=
+    COVERAGE_FILE=.coverage
+commands=
+    coverage combine
+    coverage html
+
+[pytest]
+junit_family = xunit2
diff --git a/dcae-policy/tox.ini b/dcae-policy/tox.ini
index 42a4c39..2315666 100644
--- a/dcae-policy/tox.ini
+++ b/dcae-policy/tox.ini
@@ -1,8 +1,11 @@
-# content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py27,py36
+envlist = py27,py36,cov
 
 [testenv]
+# coverage can only find modules if pythonpath is set
+setenv=
+    PYTHONPATH={toxinidir}
+    COVERAGE_FILE=.coverage.{envname}
 deps=
     -rrequirements.txt
     pytest
@@ -12,5 +15,18 @@ whitelist_externals=
     /bin/mkdir
 commands=
     mkdir -p logs
-    pytest --junitxml xunit-results.xml --cov dcaepolicyplugin --cov-report xml
+    coverage erase
+    pytest --junitxml xunit-results.{envname}.xml --cov dcaepolicyplugin
+
+[testenv:cov]
+skip_install = true
+deps=
+    coverage
+setenv=
+    COVERAGE_FILE=.coverage
+commands=
+    coverage combine
     coverage xml
+
+[pytest]
+junit_family = xunit2