diff options
| author | Vu Tran <vu.tran@windriver.com> | 2014-05-14 16:12:41 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-05-21 14:35:25 -0400 |
| commit | 2d5085be3f50d7c7256a75ce92a74f54eaa7af9a (patch) | |
| tree | b19d46d21f6e755cba568bd8d0e2efceb81e891c /meta-openstack/recipes-devtools/python/python-heat | |
| parent | 18e871ba58697e651f8036cae4d41f631cf218d8 (diff) | |
| download | meta-cloud-services-2d5085be3f50d7c7256a75ce92a74f54eaa7af9a.tar.gz | |
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>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-heat')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-heat/heat-tests-change-project_dir-path.patch | 23 |
1 files changed, 23 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 @@ | |||
| 1 | heat tests change project_dir path | ||
| 2 | |||
| 3 | By default, heat-tests sets project dir to | ||
| 4 | /usr/<lib/lib64>/python2.7/site-packages/. However | ||
| 5 | all heat config files are within /etc/heat. So | ||
| 6 | set project_dir to "/" | ||
| 7 | |||
| 8 | Signed-off-by: Vu Tran <vu.tran@windriver.com> | ||
| 9 | |||
| 10 | diff --git a/heat/tests/common.py b/heat/tests/common.py | ||
| 11 | index ea5df9a..2bdc231 100644 | ||
| 12 | --- a/heat/tests/common.py | ||
| 13 | +++ b/heat/tests/common.py | ||
| 14 | @@ -42,7 +42,8 @@ class HeatTestCase(testtools.TestCase): | ||
| 15 | self.addCleanup(enable_sleep) | ||
| 16 | |||
| 17 | mod_dir = os.path.dirname(sys.modules[__name__].__file__) | ||
| 18 | - project_dir = os.path.abspath(os.path.join(mod_dir, '../../')) | ||
| 19 | + #project_dir = os.path.abspath(os.path.join(mod_dir, '../../')) | ||
| 20 | + project_dir = "/" | ||
| 21 | env_dir = os.path.join(project_dir, 'etc', 'heat', | ||
| 22 | 'environment.d') | ||
| 23 | |||
