heat tests change project_dir path

By default, heat-tests sets project dir to
/usr/<lib/lib64>/python2.7/site-packages/ which
is the starting place for heat-tests to search
for default environment setting file.  However all
the required file are in /etc/heat. So
set project_dir to "/"

Signed-off-by: Vu Tran <vu.tran@windriver.com>

2 files changed, 24 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-heat/heat-tests-change-project_dir-path.patch b/meta-openstack/recipes-devtools/python/python-heat/heat-tests-change-project_dir-path.patch
new file mode 100644
index 0000000..c3927d4
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-heat/heat-tests-change-project_dir-path.patch
@@ -0,0 +1,23 @@
+heat tests change project_dir path
+
+By default, heat-tests sets project dir to
+/usr/<lib/lib64>/python2.7/site-packages/.  However
+all heat config files are within /etc/heat.  So
+set project_dir to "/"
+
+Signed-off-by: Vu Tran <vu.tran@windriver.com>
+
+diff --git a/heat/tests/common.py b/heat/tests/common.py
+index ea5df9a..2bdc231 100644
+--- a/heat/tests/common.py
++++ b/heat/tests/common.py
+@@ -42,7 +42,8 @@ class HeatTestCase(testtools.TestCase):
+         self.addCleanup(enable_sleep)
+ 
+         mod_dir = os.path.dirname(sys.modules[__name__].__file__)
+-        project_dir = os.path.abspath(os.path.join(mod_dir, '../../'))
++        #project_dir = os.path.abspath(os.path.join(mod_dir, '../../'))
++        project_dir = "/"
+         env_dir = os.path.join(project_dir, 'etc', 'heat',
+                                'environment.d')
+ 
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 4d8b832..a277cfd 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \
            file://autoscaling_example.template \
            file://one_vm_example.template \
            file://two_vms_example.template \
+           file://heat-tests-change-project_dir-path.patch \
 "
 
 SRCREV="69145518cb9a20d401c4213a030c39caaad1c326"