diff options
| author | Matthew Treinish <mtreinish@kortar.org> | 2017-09-14 17:29:19 -0400 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2017-09-15 10:35:53 -0500 |
| commit | 12552cee707da63a5f76adab5e16b34d738b027a (patch) | |
| tree | 0e319a9c9dbca4f507ac6a0be51cd9eb1dc11053 /openstackclient/tests | |
| parent | f63bb180036c0f2d096eefaaaf2fbdd60a427343 (diff) | |
| download | python-openstackclient-12552cee707da63a5f76adab5e16b34d738b027a.tar.gz | |
Fix subunit collection in functional tests with ostestr>=1.0.0
With the release of os-testr 1.0.0 stestr is used internally and because
of that the repository dir and commands to get subunit are different.
This commit updates the post-test hook to get the subunit stream if
ostestr>=1.0.0 is used.
Change-Id: I2cce7f4780ce418398b17a5848def9072372841e
Diffstat (limited to 'openstackclient/tests')
| -rwxr-xr-x | openstackclient/tests/functional/post_test_hook.sh | 8 | ||||
| -rwxr-xr-x | openstackclient/tests/functional/post_test_hook_tips.sh | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/openstackclient/tests/functional/post_test_hook.sh b/openstackclient/tests/functional/post_test_hook.sh index b7a39cfe..2ae9178d 100755 --- a/openstackclient/tests/functional/post_test_hook.sh +++ b/openstackclient/tests/functional/post_test_hook.sh @@ -15,6 +15,14 @@ function generate_testr_results { sudo gzip -9 $BASE/logs/testr_results.html sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz + elif [ -f .stestr/0 ]; then + sudo .tox/functional/bin/stestr last --subunit > $WORKSPACE/testrepository.subunit + sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit + sudo .tox/functional/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html + sudo gzip -9 $BASE/logs/testrepository.subunit + sudo gzip -9 $BASE/logs/testr_results.html + sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz + sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz fi } diff --git a/openstackclient/tests/functional/post_test_hook_tips.sh b/openstackclient/tests/functional/post_test_hook_tips.sh index 28ab9580..a4ad19ac 100755 --- a/openstackclient/tests/functional/post_test_hook_tips.sh +++ b/openstackclient/tests/functional/post_test_hook_tips.sh @@ -19,6 +19,14 @@ function generate_testr_results { sudo gzip -9 $BASE/logs/testr_results.html sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz + elif [ -f .stestr/0 ]; then + sudo .tox/functional-tips/bin/stestr last --subunit > $WORKSPACE/testrepository.subunit + sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit + sudo .tox/functional-tips/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html + sudo gzip -9 $BASE/logs/testrepository.subunit + sudo gzip -9 $BASE/logs/testr_results.html + sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz + sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz fi } |