diff options
| author |   Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-03-05 15:35:18 -0800 |
|---|---|---|
| committer | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-03-06 08:56:41 -0800 |
| commit | 338ae6819b2e09a362fecf6c867541a1b171c3c8 (patch) | |
| tree | ca2ee8080cf7c85ab32a687481070d175e753cb9 /conductor | |
| parent | 19d220e1f87475ef762ba7f6fb39d4eb18ee4c20 (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>
Diffstat (limited to 'conductor')
| -rw-r--r-- | conductor/pom.xml | 18 | ||||
| -rw-r--r-- | conductor/test-requirements.txt | 3 | ||||
| -rwxr-xr-x | conductor/tools/pretty_tox.sh | 4 |
3 files changed, 22 insertions, 3 deletions
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 |