cinder: modify run_tests to respect --tools-dir

Since the "tools" subdir of cinder is only packaged and installed
in /etc/cinder, we need to use --tools-dir to point the test script
in the right direction. Unfortunately, run_tests.sh takes this arg
and ignores it. So we patch the script to actually respect the
directory.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 34 insertions, 1 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/0001-run_tests-respect-tools-dir.patch b/meta-openstack/recipes-devtools/python/python-cinder/0001-run_tests-respect-tools-dir.patch
new file mode 100644
index 0000000..02ee051
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cinder/0001-run_tests-respect-tools-dir.patch
@@ -0,0 +1,29 @@
+From cecd4285356bdfdb36161d24b9a3a47942643077 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Wed, 11 Dec 2013 14:25:49 -0500
+Subject: [PATCH] run_tests: respect --tools-dir
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+---
+ run_tests.sh |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/run_tests.sh b/run_tests.sh
+index 726ff438a077..f4f4d48c8808 100755
+--- a/run_tests.sh
++++ b/run_tests.sh
+@@ -146,9 +146,9 @@ function run_tests {
+   then
+     # subunit-2to1 is present, testr subunit stream should be in version 2
+     # format. Convert to version one before colorizing.
+-    bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit-2to1 | ${wrapper} tools/colorizer.py"
++    bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit-2to1 | ${wrapper} $tool_path/tools/colorizer.py"
+   else
+-    bash -c "${wrapper} $TESTRTESTS | ${wrapper} tools/colorizer.py"
++    bash -c "${wrapper} $TESTRTESTS | ${wrapper} $tool_path/tools/colorizer.py"
+   fi
+   RESULT=$?
+   set -e
+-- 
+1.7.10.4
+
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 50eacaa..c441828 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
     file://cinder.conf \
     file://cinder.init \
     file://cinder-volume \
+    file://0001-run_tests-respect-tools-dir.patch \
         "
 
 SRCREV="1f99a044580286bf0d927cc7fc7ce3378653aef0"
@@ -48,7 +49,9 @@ do_install_append() {
         install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume
     fi
 
+    # test setup
     cp run_tests.sh ${CINDER_CONF_DIR}
+    cp -r tools ${CINDER_CONF_DIR}
 }
 
 pkg_postinst_${SRCNAME}-setup () {
@@ -75,7 +78,8 @@ ALLOW_EMPTY_${SRCNAME}-setup = "1"
 
 FILES_${PN} = "${libdir}/*"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
+FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh \
+                          ${sysconfdir}/${SRCNAME}/tools"
 
 FILES_${SRCNAME}-api = "${bindir}/cinder-api \
     ${sysconfdir}/init.d/cinder-api"