3 files changed, 41 insertions, 66 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 @@
-From 7f9d9b9d5f5621f00ba1a425307de0c242fc3453 Mon Sep 17 00:00:00 2001
-From: Keith Holman <Keith.Holman@windriver.com>
-Date: Fri, 30 May 2014 11:40:39 -0400
-Subject: [PATCH] horizon: fix test script to not require coverage tool
-
-Horizon provides a run_tests.sh script for testing the
-functionality of the installation of the product in the target
-environment.  The script contains a "-c" option to allow code
-coverage testing using the "coverage" tool.  However, the
-script currently still calls the tool even if the option is not
-given.  This fix removes the dependency on the "coverage"
-command if the "-c" option is not passed to the script.
-
-Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
----
- run_tests.sh | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/run_tests.sh b/run_tests.sh
-index 5993c81..a297cd9 100755
---- a/run_tests.sh
-+++ b/run_tests.sh
-@@ -298,8 +298,12 @@ function run_tests_all {
-   if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
-     export NOSE_HTML_OUT_FILE='horizon_nose_results.html'
-   fi
--  ${command_wrapper} coverage erase
--  ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts
-+  if [ $with_coverage -eq 1 ]; then
-+    ${command_wrapper} coverage erase
-+    ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts
-+  else
-+    ${command_wrapper} python $root/manage.py test horizon --settings=horizon.test.settings $testopts
-+  fi
-   # get results of the Horizon tests
-   HORIZON_RESULT=$?
- 
-@@ -308,7 +312,11 @@ function run_tests_all {
-   if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
-     export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
-   fi
--  ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts
-+  if [ $with_coverage -eq 1 ]; then
-+    ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts
-+  else
-+    ${command_wrapper} python $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts
-+  fi
-   # get results of the openstack_dashboard tests
-   DASHBOARD_RESULT=$?
- 
-@@ -317,9 +325,9 @@ function run_tests_all {
-     ${command_wrapper} coverage combine
-     ${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.venv/*'
-     ${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports
-+    # Remove the leftover coverage files from the -p flag earlier.
-+    rm -f .coverage.*
-   fi
--  # Remove the leftover coverage files from the -p flag earlier.
--  rm -f .coverage.*
- 
-   if [ $(($HORIZON_RESULT || $DASHBOARD_RESULT)) -eq 0 ]; then
-     echo "Tests completed successfully."
--- 
-1.9.3
-
diff --git a/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch b/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch
new file mode 100644
index 0000000..e5e1966
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch
@@ -0,0 +1,39 @@
+From 89aa2a575687013f4b4f4d4353c50af1de4c26ba Mon Sep 17 00:00:00 2001
+From: Keith Holman <Keith.Holman@windriver.com>
+Date: Fri, 30 May 2014 11:58:33 -0400
+Subject: [PATCH] horizon: use full package 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 an identifier that will be replaced
+within the build recipe with the full path to the python site
+packages.
+
+Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+---
+ horizon/test/settings.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/horizon/test/settings.py b/horizon/test/settings.py
+index f5ea700..10318eb 100644
+--- a/horizon/test/settings.py
++++ b/horizon/test/settings.py
+@@ -95,8 +95,8 @@ SITE_BRANDING = 'Horizon'
+ TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+ NOSE_ARGS = ['--nocapture',
+              '--nologcapture',
+-             '--exclude-dir=horizon/conf/',
+-             '--exclude-dir=horizon/test/customization',
++             '--exclude-dir=%PYTHON_SITEPACKAGES%/horizon/conf/',
++             '--exclude-dir=%PYTHON_SITEPACKAGES%/horizon/test/customization',
+              '--cover-package=horizon',
+              '--cover-inclusive',
+              '--all-modules']
+-- 
+1.9.3
+
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 3924fc8..3f9e5e6 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -38,7 +38,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \
     file://fix_bindir_path.patch \
     file://openstack-dashboard-apache.conf \
     file://local_settings.py \
-    file://horizon-fix-test-script-to-not-require-coverage-tool.patch \
+    file://horizon-use-full-package-path-to-test-directories.patch \
     "
 
 SRCREV="0c3b71055c0d169b8245aee773438dbcb46c2bcf"
@@ -69,6 +69,7 @@ do_install_append() {
         sed 's:@PYTHON_SITEPACKAGES@:${PYTHON_SITEPACKAGES_DIR}:' ${WORKDIR}/horizon.init >${WORKDIR}/horizon
         install -m 0755 ${WORKDIR}/horizon ${D}${sysconfdir}/init.d/horizon
     fi
+    sed -i -e 's#%PYTHON_SITEPACKAGES%#${PYTHON_SITEPACKAGES_DIR}#g' ${D}${PYTHON_SITEPACKAGES_DIR}/horizon/test/settings.py
 
     # no longer required. kept as reference.
     # mv ${D}${datadir}/bin ${DASHBOARD_DIR}/bin