aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests/unit/openstack
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-08-10 02:37:56 +0000
committerLinda Wang <wangwulin@huawei.com>2017-08-10 04:01:10 +0000
commite18c6f652f2874fe1df2ed61972560b6e053d500 (patch)
tree46e9a5a3cbe07a8b41a3f843570a19b842de7ee8 /functest/tests/unit/openstack
parentcd4716eb5fa3a12e256fba8faa75780b7398ff68 (diff)
Add/Update tempest.conf via a specific file
Provides a convenient way to configure all params which users required. JIRA: FUNCTEST-860 Change-Id: Iadfb704285f94530e1023ee780138f22dd672d33 Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/tests/unit/openstack')
-rw-r--r--functest/tests/unit/openstack/tempest/test_conf_utils.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index 37904965..79ef9915 100644
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@ -261,8 +261,11 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
'write') as mwrite, \
mock.patch('__builtin__.open', mock.mock_open()), \
mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.backup_tempest_config'):
+ 'conf_utils.backup_tempest_config'), \
+ mock.patch('functest.utils.functest_utils.yaml.safe_load') \
+ as mock_yaml:
CONST.__setattr__('OS_ENDPOINT_TYPE', None)
+ mock_yaml.return_value = mock.Mock()
conf_utils.\
configure_tempest_update_params('test_conf_file',
IMAGE_ID=image_id,