diff options
| author | Keith Holman <Keith.Holman@windriver.com> | 2014-05-30 12:55:48 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-04 10:17:07 -0400 |
| commit | b06874fd38f3c2e77fb6f1950f4f70a3dbeca418 (patch) | |
| tree | d18f670afff95fea393a35f6c35be5a2f31482b9 /meta-openstack/recipes-devtools/python/python-horizon/horizon-fix-test-script-to-not-require-coverage-tool.patch | |
| parent | 74d156db9f696cf9b3a4fbe9c006605198e261da (diff) | |
| download | meta-cloud-services-b06874fd38f3c2e77fb6f1950f4f70a3dbeca418.tar.gz | |
horizon: add full path to test directories
The tests included Horizon expect all files to be in a single
location in order to be run directly from the source tree. The
recipe for installing Horizon on the system installs Horizon
as a python site-package and puts files in different locations
depending on the file type. In order to have the tests support
this type of install we need to explicitly indicate the full path
of the test files to exclude in order to have the tests run
successfully. This fix adds the absolute path to the test
locations allows the Horizon tests to pass as expected.
Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-horizon/horizon-fix-test-script-to-not-require-coverage-tool.patch')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-horizon/horizon-fix-test-script-to-not-require-coverage-tool.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-horizon/horizon-fix-test-script-to-not-require-coverage-tool.patch b/meta-openstack/recipes-devtools/python/python-horizon/horizon-fix-test-script-to-not-require-coverage-tool.patch deleted file mode 100644 index 83ac9a4..0000000 --- a/meta-openstack/recipes-devtools/python/python-horizon/horizon-fix-test-script-to-not-require-coverage-tool.patch +++ /dev/null | |||
| @@ -1,65 +0,0 @@ | |||
| 1 | From 7f9d9b9d5f5621f00ba1a425307de0c242fc3453 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Keith Holman <Keith.Holman@windriver.com> | ||
| 3 | Date: Fri, 30 May 2014 11:40:39 -0400 | ||
| 4 | Subject: [PATCH] horizon: fix test script to not require coverage tool | ||
| 5 | |||
| 6 | Horizon provides a run_tests.sh script for testing the | ||
| 7 | functionality of the installation of the product in the target | ||
| 8 | environment. The script contains a "-c" option to allow code | ||
| 9 | coverage testing using the "coverage" tool. However, the | ||
| 10 | script currently still calls the tool even if the option is not | ||
| 11 | given. This fix removes the dependency on the "coverage" | ||
| 12 | command if the "-c" option is not passed to the script. | ||
| 13 | |||
| 14 | Signed-off-by: Keith Holman <Keith.Holman@windriver.com> | ||
| 15 | --- | ||
| 16 | run_tests.sh | 18 +++++++++++++----- | ||
| 17 | 1 file changed, 13 insertions(+), 5 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/run_tests.sh b/run_tests.sh | ||
| 20 | index 5993c81..a297cd9 100755 | ||
| 21 | --- a/run_tests.sh | ||
| 22 | +++ b/run_tests.sh | ||
| 23 | @@ -298,8 +298,12 @@ function run_tests_all { | ||
| 24 | if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then | ||
| 25 | export NOSE_HTML_OUT_FILE='horizon_nose_results.html' | ||
| 26 | fi | ||
| 27 | - ${command_wrapper} coverage erase | ||
| 28 | - ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts | ||
| 29 | + if [ $with_coverage -eq 1 ]; then | ||
| 30 | + ${command_wrapper} coverage erase | ||
| 31 | + ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts | ||
| 32 | + else | ||
| 33 | + ${command_wrapper} python $root/manage.py test horizon --settings=horizon.test.settings $testopts | ||
| 34 | + fi | ||
| 35 | # get results of the Horizon tests | ||
| 36 | HORIZON_RESULT=$? | ||
| 37 | |||
| 38 | @@ -308,7 +312,11 @@ function run_tests_all { | ||
| 39 | if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then | ||
| 40 | export NOSE_HTML_OUT_FILE='dashboard_nose_results.html' | ||
| 41 | fi | ||
| 42 | - ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts | ||
| 43 | + if [ $with_coverage -eq 1 ]; then | ||
| 44 | + ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts | ||
| 45 | + else | ||
| 46 | + ${command_wrapper} python $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts | ||
| 47 | + fi | ||
| 48 | # get results of the openstack_dashboard tests | ||
| 49 | DASHBOARD_RESULT=$? | ||
| 50 | |||
| 51 | @@ -317,9 +325,9 @@ function run_tests_all { | ||
| 52 | ${command_wrapper} coverage combine | ||
| 53 | ${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.venv/*' | ||
| 54 | ${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports | ||
| 55 | + # Remove the leftover coverage files from the -p flag earlier. | ||
| 56 | + rm -f .coverage.* | ||
| 57 | fi | ||
| 58 | - # Remove the leftover coverage files from the -p flag earlier. | ||
| 59 | - rm -f .coverage.* | ||
| 60 | |||
| 61 | if [ $(($HORIZON_RESULT || $DASHBOARD_RESULT)) -eq 0 ]; then | ||
| 62 | echo "Tests completed successfully." | ||
| 63 | -- | ||
| 64 | 1.9.3 | ||
| 65 | |||
