diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | conductor/pom.xml | 18 | ||||
| -rw-r--r-- | conductor/test-requirements.txt | 3 | ||||
| -rwxr-xr-x | conductor/tools/pretty_tox.sh | 4 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rwxr-xr-x | sonar.sh | 41 |
6 files changed, 65 insertions, 3 deletions
@@ -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 @@ -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 |