From 373f0f3559049ea91a3fb47a445c554512c36435 Mon Sep 17 00:00:00 2001
From: Andrew Gauld <ag1282@att.com>
Date: Wed, 21 Feb 2018 11:14:46 -0500
Subject: Make SONAR code coverage analysis work

Change-Id: I8091aea6127b78de404c986be74ecf44935ab92f
Issue-ID: DCAEGEN2-355
Signed-off-by: Andrew Gauld <ag1282@att.com>
---
 onap-dcae-cbs-docker-client/.coveragerc | 5 -----
 onap-dcae-cbs-docker-client/pom.xml     | 2 +-
 onap-dcae-cbs-docker-client/tox.ini     | 5 ++++-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'onap-dcae-cbs-docker-client')

diff --git a/onap-dcae-cbs-docker-client/.coveragerc b/onap-dcae-cbs-docker-client/.coveragerc
index 38c506c..c60c1ee 100644
--- a/onap-dcae-cbs-docker-client/.coveragerc
+++ b/onap-dcae-cbs-docker-client/.coveragerc
@@ -21,8 +21,3 @@ exclude_lines =
     # Don't complain if non-runnable code isn't run:
     if 0:
     if __name__ == .__main__.:
-
-[xml]
-output = coverage-reports/coverage-configbinding.xml
-
-
diff --git a/onap-dcae-cbs-docker-client/pom.xml b/onap-dcae-cbs-docker-client/pom.xml
index d334aae..bbbdc12 100644
--- a/onap-dcae-cbs-docker-client/pom.xml
+++ b/onap-dcae-cbs-docker-client/pom.xml
@@ -45,7 +45,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <sonar.language>py</sonar.language>
     <sonar.pluginName>Python</sonar.pluginName>
     <sonar.inclusions>**/*.py</sonar.inclusions>
-    <sonar.exclusions>tests/*</sonar.exclusions>
+    <sonar.exclusions>tests/*,setup.py</sonar.exclusions>
     <sonar.host.url>http://135.205.228.63:9000</sonar.host.url>
   </properties>
   <build>
diff --git a/onap-dcae-cbs-docker-client/tox.ini b/onap-dcae-cbs-docker-client/tox.ini
index cad80d0..d3aa5da 100644
--- a/onap-dcae-cbs-docker-client/tox.ini
+++ b/onap-dcae-cbs-docker-client/tox.ini
@@ -10,5 +10,8 @@ deps=
 setenv =
     CONSUL_HOST = consuldotcom
     HOSTNAME = mybestfrienddotcom
+    PYTHONPATH={toxinidir}
 
-commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir}/onap_dcae_cbs_docker_client --cov-report=xml
+commands=
+    pytest --junitxml xunit-results.xml --cov onap_dcae_cbs_docker_client --cov-report xml
+    coverage xml
-- 
cgit 1.2.3-korg