diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-01-13 20:21:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-01-13 20:21:51 +0000 |
commit | 14a3104ecad12f06415d5e6c72bf55d270cf3e66 (patch) | |
tree | 5455be479e3243976e854db5ff6bf902a801898a | |
parent | 570ed32fa1e07cacc7e8ad558858574ac6c28743 (diff) | |
parent | 7e5496763522475bb07a377359d69454f1942e1b (diff) | |
download | os-client-config-14a3104ecad12f06415d5e6c72bf55d270cf3e66.tar.gz |
Merge "Return empty dict instead of None for lack of file"
-rw-r--r-- | os_client_config/config.py | 2 | ||||
-rw-r--r-- | os_client_config/tests/test_config.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index bda62da..edea0d4 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -316,7 +316,7 @@ class OpenStackConfig(object): return path, json.load(f) else: return path, yaml.safe_load(f) - return (None, None) + return (None, {}) def _normalize_keys(self, config): new_config = {} diff --git a/os_client_config/tests/test_config.py b/os_client_config/tests/test_config.py index 4440ac8..dce436a 100644 --- a/os_client_config/tests/test_config.py +++ b/os_client_config/tests/test_config.py @@ -171,6 +171,13 @@ class TestConfig(base.TestCase): self.assertEqual('user', cc.auth['username']) self.assertEqual('testpass', cc.auth['password']) + def test_only_secure_yaml(self): + c = config.OpenStackConfig(config_files=['nonexistent'], + vendor_files=['nonexistent'], + secure_files=[self.secure_yaml]) + cc = c.get_one_cloud(cloud='_test_cloud_no_vendor') + self.assertEqual('testpass', cc.auth['password']) + def test_get_cloud_names(self): c = config.OpenStackConfig(config_files=[self.cloud_yaml], secure_files=[self.no_yaml]) |