From 12552cee707da63a5f76adab5e16b34d738b027a Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Thu, 14 Sep 2017 17:29:19 -0400
Subject: [PATCH] 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
---
openstackclient/tests/functional/post_test_hook.sh | 8 ++++++++
openstackclient/tests/functional/post_test_hook_tips.sh | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/openstackclient/tests/functional/post_test_hook.sh b/openstackclient/tests/functional/post_test_hook.sh
index b7a39cfed9..2ae9178d56 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 28ab958006..a4ad19ac62 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
}