keystone: fix location of files for tests

Keystone tests define the location of certificate files
as the location of the files in the source tree. However,
when installed on the system files are put in different
locations.  This change patches the configuration file
for some tests to contain the full path to the tests
directories.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>

2 files changed, 37 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone-fix-location-of-files-for-tests.patch b/meta-openstack/recipes-devtools/python/python-keystone/keystone-fix-location-of-files-for-tests.patch
new file mode 100644
index 0000000..3e73696
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone-fix-location-of-files-for-tests.patch
@@ -0,0 +1,34 @@
+From 205ee3cfa4c7efd39f5fe991b53327c1bd771f97 Mon Sep 17 00:00:00 2001
+From: Keith Holman <Keith.Holman@windriver.com>
+Date: Tue, 3 Jun 2014 16:19:54 -0400
+Subject: [PATCH] keystone: fix location of files for tests
+
+Keystone tests define the location of certificate files
+as the location of the files in the source tree. However,
+when installed on the system these files are put in a
+different location.  This patch provides a symbol, which
+is replaced, for the base path of the location of the test
+files.
+
+Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+---
+ keystone/tests/test_overrides.conf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/keystone/tests/test_overrides.conf b/keystone/tests/test_overrides.conf
+index 801b0d2..ba35343 100644
+--- a/keystone/tests/test_overrides.conf
++++ b/keystone/tests/test_overrides.conf
+@@ -21,6 +21,6 @@ debug_cache_backend = True
+ proxies = keystone.tests.test_cache.CacheIsolatingProxy
+ 
+ [signing]
+-certfile = ../../examples/pki/certs/signing_cert.pem
+-keyfile = ../../examples/pki/private/signing_key.pem
+-ca_certs = ../../examples/pki/certs/cacert.pem
++certfile = %KEYSTONE_PACKAGE_DIR%/examples/pki/certs/signing_cert.pem
++keyfile = %KEYSTONE_PACKAGE_DIR%/examples/pki/private/signing_key.pem
++ca_certs = %KEYSTONE_PACKAGE_DIR%/examples/pki/certs/cacert.pem
+-- 
+1.9.3
+
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 3f4220c..4c28f78 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
            file://keystone \
            file://openrc \
            file://keystone-search-in-etc-directory-for-config-files.patch \
+           file://keystone-fix-location-of-files-for-tests.patch \
            "
 
 SRCREV="a96d1a44bc0f074729c312e5c2a0f0875edf1765"
@@ -58,6 +59,8 @@ do_install_append() {
         install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone
     fi
 
+    sed -e "s:%KEYSTONE_PACKAGE_DIR%:${PYTHON_SITEPACKAGES_DIR}/keystone:g" -i ${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf
+
     cp run_tests.sh ${KEYSTONE_CONF_DIR}
 }