diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-13 14:19:24 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-13 14:20:32 +0200 |
| commit | cdcf4e4b977ad2a7ccbe18d99302f26367623ced (patch) | |
| tree | 15a9c10d1dc49d7f0ffa204f041bbf449bbd70df /snaps | |
| parent | e6ec3766be49d69a44ca1e1348bbf5e6ed692c84 (diff) | |
Check dev_os_env_file exists before loading it
The testcases should work even if no specific metadata are set.
Change-Id: I3fa6aea3588f37946a847042903f313e33a728f8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'snaps')
| -rw-r--r-- | snaps/openstack/tests/os_source_file_test.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py index bd98ad3..cddf395 100644 --- a/snaps/openstack/tests/os_source_file_test.py +++ b/snaps/openstack/tests/os_source_file_test.py @@ -63,13 +63,15 @@ class OSComponentTestCase(unittest.TestCase): test_conf = file_utils.read_yaml(dev_os_env_file) self.ext_net_name = test_conf.get('ext_net') + self.flavor_metadata = {} if flavor_metadata: self.flavor_metadata = flavor_metadata else: - os_env_dict = file_utils.read_yaml(dev_os_env_file) - flavor_metadata = os_env_dict.get('flavor_metadata') - if flavor_metadata: - self.flavor_metadata = {'metadata': flavor_metadata} + if file_utils.file_exists(dev_os_env_file): + os_env_dict = file_utils.read_yaml(dev_os_env_file) + flavor_metadata = os_env_dict.get('flavor_metadata') + if flavor_metadata: + self.flavor_metadata = {'metadata': flavor_metadata} self.image_metadata = image_metadata @staticmethod |