From cdcf4e4b977ad2a7ccbe18d99302f26367623ced Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 13 Jun 2018 14:19:24 +0200 Subject: Check dev_os_env_file exists before loading it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The testcases should work even if no specific metadata are set. Change-Id: I3fa6aea3588f37946a847042903f313e33a728f8 Signed-off-by: Cédric Ollivier --- snaps/openstack/tests/os_source_file_test.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'snaps') 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 -- cgit 1.2.3-korg