novaclient: fix path to test certificate

Novaclient contains a test that fails because it can't
find the path to the test certficate.  This is because
the test is based off of running the test from the base
of the source tree.  This fix changes the path to look
for the certificate from a relative path to the absolute
path allowing the test to be ran from any directory.

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

2 files changed, 39 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch b/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch
new file mode 100644
index 0000000..dff3edd
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-novaclient/novaclient-specify-full-path-to-test-certificate.patch
@@ -0,0 +1,35 @@
+From bdd853d38c7b14088d3e6368e298201c249ab004 Mon Sep 17 00:00:00 2001
+From: Keith Holman <Keith.Holman@windriver.com>
+Date: Fri, 13 Jun 2014 09:54:41 -0400
+Subject: [PATCH] novaclient: specify full path to test certificate
+
+The tests shipped with novaclient assume that the files
+exist at the same location as are appear within the
+source tree.  The tests also assume that the test is ran
+from the root of the tree. This causes a test to fail as
+it can't find a test certificate used in one of the
+tests.  This patch fixes the affected test by putting in
+an identifier that is replaced with the full path to the
+certificate file.
+
+Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
+---
+ novaclient/tests/v1_1/test_servers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/novaclient/tests/v1_1/test_servers.py b/novaclient/tests/v1_1/test_servers.py
+index a48204c..443adc3 100644
+--- a/novaclient/tests/v1_1/test_servers.py
++++ b/novaclient/tests/v1_1/test_servers.py
+@@ -462,7 +462,7 @@ class ServersTest(utils.TestCase):
+ 
+     def test_get_password(self):
+         s = cs.servers.get(1234)
+-        self.assertEqual(s.get_password('novaclient/tests/idfake.pem'),
++        self.assertEqual(s.get_password('%PYTHON_SITEPACKAGES_DIR%/novaclient/tests/idfake.pem'),
+                          b'FooBar123')
+         cs.assert_called('GET', '/servers/1234/os-server-password')
+ 
+-- 
+1.9.3
+
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index 9d114d2..3bb3aac 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -9,6 +9,7 @@ PR = "r0"
 SRC_URI = "\
         git://github.com/openstack/python-novaclient.git;branch=master \
         file://fix_novaclient_memory_leak.patch \
+        file://novaclient-specify-full-path-to-test-certificate.patch \
         "
 
 PV="2.16.0+git${SRCPV}"
@@ -36,6 +37,9 @@ PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-
 do_install_append() {
         install -d ${D}/${sysconfdir}/bash_completion.d
         install -m 664 ${S}/tools/nova.bash_completion ${D}/${sysconfdir}/bash_completion.d
+
+        sed -e "s:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g" \
+            -i ${D}/${PYTHON_SITEPACKAGES_DIR}/novaclient/tests/v1_1/test_servers.py
 }
 
 PACKAGES =+ "${BPN}-bash-completion"