diff options
| author | Vu Tran <vu.tran@windriver.com> | 2014-06-18 15:45:37 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-23 15:55:45 -0400 |
| commit | cb6a12ad7c10b7cf2922facd3464200272a34996 (patch) | |
| tree | b43966bffc53341c9f64243760529d63f0f54c9d /meta-openstack/recipes-devtools/python/python-cinder | |
| parent | eb66359572b003e3babf58fca317363cd06a16c0 (diff) | |
| download | meta-cloud-services-cb6a12ad7c10b7cf2922facd3464200272a34996.tar.gz | |
cinder builtin tests config location
Many cinder built-in testcases failed because they
can not find cinder configuration file, as these
testcases assume that they are run at python
site-packages dir. So forcing these failure
testcases to look for these configuration file
using absolute path.
Signed-off-by: Vu Tran <vu.tran@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-cinder')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch b/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch new file mode 100644 index 0000000..c6bdfa7 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder-builtin-tests-config-location.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | cinder builtin tests config location | ||
| 2 | |||
| 3 | Many cinder built-in testcases failed because they | ||
| 4 | can not find cinder configuration file, as these | ||
| 5 | testcases assume that they are run at python | ||
| 6 | site-packages dir. So forcing these failure | ||
| 7 | testcases to look for these confiugration file | ||
| 8 | using absolute path. | ||
| 9 | |||
| 10 | Signed-off-by: Vu Tran <vu.tran@windriver.com> | ||
| 11 | |||
| 12 | diff --git a/cinder/tests/conf_fixture.py b/cinder/tests/conf_fixture.py | ||
| 13 | index dbf8d08..ac925eb 100644 | ||
| 14 | --- a/cinder/tests/conf_fixture.py | ||
| 15 | +++ b/cinder/tests/conf_fixture.py | ||
| 16 | @@ -43,7 +43,7 @@ def set_defaults(conf): | ||
| 17 | conf.set_default('verbose', True) | ||
| 18 | conf.set_default('connection', 'sqlite://', group='database') | ||
| 19 | conf.set_default('sqlite_synchronous', False) | ||
| 20 | - conf.set_default('policy_file', 'cinder/tests/policy.json') | ||
| 21 | + conf.set_default('policy_file', '%PYTHON_SITEPACKAGES_DIR%/cinder/tests/policy.json') | ||
| 22 | conf.set_default( | ||
| 23 | 'xiv_ds8k_proxy', | ||
| 24 | 'cinder.tests.test_xiv_ds8k.XIVDS8KFakeProxyDriver') | ||
| 25 | diff --git a/cinder/tests/fake_flags.py b/cinder/tests/fake_flags.py | ||
| 26 | index 3bf94ae..998524c 100644 | ||
| 27 | --- a/cinder/tests/fake_flags.py | ||
| 28 | +++ b/cinder/tests/fake_flags.py | ||
| 29 | @@ -43,6 +43,6 @@ def set_defaults(conf): | ||
| 30 | conf.set_default('verbose', True) | ||
| 31 | conf.set_default('connection', 'sqlite://', group='database') | ||
| 32 | conf.set_default('sqlite_synchronous', False) | ||
| 33 | - conf.set_default('policy_file', 'cinder/tests/policy.json') | ||
| 34 | + conf.set_default('policy_file', '%PYTHON_SITEPACKAGES_DIR%/cinder/tests/policy.json') | ||
| 35 | conf.set_default('xiv_proxy', 'cinder.tests.test_xiv.XIVFakeProxyDriver') | ||
| 36 | conf.set_default('backup_driver', 'cinder.tests.backup.fake_service') | ||
