From 03686e0bc97200102a20fb5e2a0caa5b3d314879 Mon Sep 17 00:00:00 2001
From: Lukasz Wiecek <Lukasz.Wiecek@ts.fujitsu.com>
Date: Tue, 31 Jan 2017 14:52:00 +0100
Subject: [PATCH] Changes for CI improvement and generate nosetests.xml

Change-Id: Ie8f19bf284cd86a49e8879e51ff3dcb9360054d5
---
 monitoring/test/settings.py | 1 +
 run_tests.sh                | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/monitoring/test/settings.py b/monitoring/test/settings.py
index ce594396..cf57f57d 100644
--- a/monitoring/test/settings.py
+++ b/monitoring/test/settings.py
@@ -128,4 +128,5 @@ NOSE_ARGS = ['--nocapture',
              '--nologcapture',
              '--cover-package=monitoring',
              '--cover-inclusive',
+             '--with-xunit',
              '--all-modules']
diff --git a/run_tests.sh b/run_tests.sh
index d7ab894d..dab0223c 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -319,8 +319,8 @@ function run_tests_all {
   if [ $with_coverage -eq 1 ]; then
     echo "Generating coverage reports"
     ${command_wrapper} ${COVERAGE_CMD} combine
-    ${command_wrapper} ${COVERAGE_CMD} xml -i --omit='/usr*,setup.py,*egg*,.venv/*'
-    ${command_wrapper} ${COVERAGE_CMD} html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports
+    ${command_wrapper} ${COVERAGE_CMD} xml -i --omit='monitoring/**/tests.py,monitoring/test/*,**/shiningpanda/**,/usr*,setup.py,*egg*,.venv/*'
+    ${command_wrapper} ${COVERAGE_CMD} html -i --omit='monitoring/**/tests.py,monitoring/test/*,**/shiningpanda/**,/usr*,setup.py,*egg*,.venv/*' -d reports
   fi
   # Remove the leftover coverage files from the -p flag earlier.
   rm -f .coverage.*