diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-08-10 08:56:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-10 08:56:10 +0000 |
| commit | a91f8ca024935ad516237845fa4d83412b232b26 (patch) | |
| tree | 4bb77261b75496e9e80b8fbbacc4ad5a1bd563af /functest/tests/unit/openstack/tempest/test_conf_utils.py | |
| parent | c12e84bc3274eeabc4200575821dae1cd80ce16e (diff) | |
| parent | e18c6f652f2874fe1df2ed61972560b6e053d500 (diff) | |
Merge "Add/Update tempest.conf via a specific file"
Diffstat (limited to 'functest/tests/unit/openstack/tempest/test_conf_utils.py')
| -rw-r--r-- | functest/tests/unit/openstack/tempest/test_conf_utils.py | 5 |
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, |