summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-03-05 15:35:18 -0800
committerDileep Ranganathan <dileep.ranganathan@intel.com>2018-03-06 08:56:41 -0800
commit338ae6819b2e09a362fecf6c867541a1b171c3c8 (patch)
treeca2ee8080cf7c85ab32a687481070d175e753cb9
parent19d220e1f87475ef762ba7f6fb39d4eb18ee4c20 (diff)
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>
-rw-r--r--.gitignore1
-rw-r--r--conductor/pom.xml18
-rw-r--r--conductor/test-requirements.txt3
-rwxr-xr-xconductor/tools/pretty_tox.sh4
-rw-r--r--pom.xml1
-rwxr-xr-xsonar.sh41
6 files changed, 65 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index f4b9455..a5cf397 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ conductor/conductor/common/music/voting.py
.cache
nosetests.xml
coverage.xml
+xunit*.xml
# Translations
*.mo
diff --git a/conductor/pom.xml b/conductor/pom.xml
index db0f047..b18ac36 100644
--- a/conductor/pom.xml
+++ b/conductor/pom.xml
@@ -34,6 +34,24 @@
<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>
<appendAssemblyId>false</appendAssemblyId>
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
diff --git a/pom.xml b/pom.xml
index 505fac8..9c6a7d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
<sonar.sources>conductor/conductor</sonar.sources>
<sonar.tests>conductor/conductor/tests</sonar.tests>
+ <sonar.junit.reportsPath>conductor/xunit-results.xml</sonar.junit.reportsPath>
<sonar.python.coverage.reportPath>conductor/cover/coverage.xml</sonar.python.coverage.reportPath>
<sonar.language>py</sonar.language>
<sonar.pluginname>python</sonar.pluginname>
diff --git a/sonar.sh b/sonar.sh
new file mode 100755
index 0000000..566ede7
--- /dev/null
+++ b/sonar.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# -------------------------------------------------------------------------
+# Copyright (c) 2018 Intel Corporation Intellectual Property
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# -------------------------------------------------------------------------
+#
+
+run_tox_test()
+{
+ set -x
+ CURDIR=$(pwd)
+ TOXINIS=$(find . -name "tox.ini")
+ for TOXINI in "${TOXINIS[@]}"; do
+ DIR=$(echo "$TOXINI" | rev | cut -f2- -d'/' | rev)
+ cd "${CURDIR}/${DIR}"
+ rm -rf ./venv-tox ./.tox
+ virtualenv ./venv-tox
+ source ./venv-tox/bin/activate
+ pip install --upgrade pip
+ pip install --upgrade tox argparse
+ pip freeze
+ tox -e cover
+ deactivate
+ rm -rf ./venv-tox ./.tox
+ done
+}
+
+run_tox_test