From 338ae6819b2e09a362fecf6c867541a1b171c3c8 Mon Sep 17 00:00:00 2001
From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Mon, 5 Mar 2018 15:35:18 -0800
Subject: Fix Sonar coverage report

Added maven-exec plugin to trigger tox and coverage
Modified sonar properties to set the path to reports
Modified .gitignore to add coverage related files
Added test dependency junitxml

Change-Id: I7e4bb5e4b6bc217b9778350c703d864e9f8ef0e2
Issue-ID: OPTFRA-101
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
---
 conductor/pom.xml               | 18 ++++++++++++++++++
 conductor/test-requirements.txt |  3 ++-
 conductor/tools/pretty_tox.sh   |  4 ++--
 3 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'conductor')

diff --git a/conductor/pom.xml b/conductor/pom.xml
index db0f047..b18ac36 100644
--- a/conductor/pom.xml
+++ b/conductor/pom.xml
@@ -33,6 +33,24 @@
     <description>Homing Allocation Service/Conductor</description>
     <build>
         <plugins>
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <executions>
+                    <execution>
+                        <id>tox-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>
+                                ${session.executionRootDirectory}/sonar.sh
+                            </executable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
diff --git a/conductor/test-requirements.txt b/conductor/test-requirements.txt
index 6bd93c6..3150f00 100644
--- a/conductor/test-requirements.txt
+++ b/conductor/test-requirements.txt
@@ -17,4 +17,5 @@ testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 os-testr>=1.0.0 # Apache-2.0
 tempest>=11.0.0  # Apache-2.0
-pifpaf>=0.0.11
\ No newline at end of file
+pifpaf>=0.0.11
+junitxml>=0.7
diff --git a/conductor/tools/pretty_tox.sh b/conductor/tools/pretty_tox.sh
index 190b39d..04c806e 100755
--- a/conductor/tools/pretty_tox.sh
+++ b/conductor/tools/pretty_tox.sh
@@ -29,7 +29,7 @@ TESTRARGS=$1
 #
 # this work around exists until that is addressed
 if [[ "$TESTARGS" =~ "until-failure" ]]; then
-    python setup.py testr --slowest --testr-args="$TESTRARGS"
+    python setup.py testr --slowest --testr-args="$TESTRARGS" | subunit2junitxml --output-to=xunit-results.xml
 else
-    python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f
+    python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-1to2 | subunit2junitxml --forward --output-to=xunit-results.xml
 fi
-- 
cgit 1.2.3-korg