keystoneclient: add example test certificates

The tests included with keystoneclient require the use of example
certificates.  This fix copies the example certificates that are found
in the source to the target system.  It also patches the test files to
find the certificates in the correct location.

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

2 files changed, 40 insertions, 1 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch
new file mode 100644
index 0000000..a75e1da
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch
@@ -0,0 +1,31 @@
+From fae14f85d43da3842b2a065baf0442d61a573598 Mon Sep 17 00:00:00 2001
+From: Keith Holman <Keith.Holman@windriver.com>
+Date: Fri, 13 Jun 2014 17:08:03 -0400
+Subject: [PATCH] keystoneclient: fix test path to example certificates
+
+The tests included with keystoneclient expect them to be ran from the
+source tree.  This fix changes base path of the system to where they
+are actually deployed on the system.  This fix is required for some
+tests to work properly.
+
+Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+---
+ keystoneclient/tests/client_fixtures.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keystoneclient/tests/client_fixtures.py b/keystoneclient/tests/client_fixtures.py
+index 1743162..6bfcb93 100644
+--- a/keystoneclient/tests/client_fixtures.py
++++ b/keystoneclient/tests/client_fixtures.py
+@@ -25,7 +25,7 @@ from keystoneclient import utils
+ 
+ 
+ TESTDIR = os.path.dirname(os.path.abspath(__file__))
+-ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..', '..'))
++ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..'))
+ CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
+ CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
+ KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private')
+-- 
+1.9.3
+
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index de75a63..a326cd7 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -5,10 +5,12 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a4d0e932ffae1c0131528d30d419c55"
 
 PR = "r0"
+SRCNAME = "keystoneclient"
 
 SRC_URI = "\
         git://github.com/openstack/python-keystoneclient.git;branch=master \
         file://fix_keystoneclient_memory_leak.patch \
+        file://keystoneclient-fix-test-path-to-example-certificates.patch \
         "
 
 PV="0.6.0+git${SRCPV}"
@@ -38,7 +40,13 @@ PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-
 do_install_append() {
         install -d ${D}/${sysconfdir}/bash_completion.d
         install -m 664 ${S}/tools/keystone.bash_completion ${D}/${sysconfdir}/bash_completion.d
+
+        cp -r ${S}/examples ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}
 }
 
-PACKAGES =+ "${BPN}-bash-completion"
+PACKAGES =+ " ${SRCNAME}-tests ${BPN}-bash-completion"
 FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
+
+FILES_${SRCNAME}-tests = "${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/examples \
+        "
+