From d1398b95c40dacdeb1bf03cbfff77a458ccb8235 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 26 Apr 2017 09:18:04 +0200 Subject: Catch os.makedirs() exceptions in tempest.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It can raise an error exception if the leaf directory already exists or cannot be created [1]. [1] https://docs.python.org/2/library/os.html JIRA: FUNCTEST-804 Change-Id: Ie410bccf1bb2dfd36df6e918c152ecf94844b5d7 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/tempest/tempest.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'functest/opnfv_tests/openstack') diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 8fa413a8..e6c6b44f 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -208,11 +208,9 @@ class TempestCommon(testcase.TestCase): def run(self): self.start_time = time.time() - - if not os.path.exists(conf_utils.TEMPEST_RESULTS_DIR): - os.makedirs(conf_utils.TEMPEST_RESULTS_DIR) - try: + if not os.path.exists(conf_utils.TEMPEST_RESULTS_DIR): + os.makedirs(conf_utils.TEMPEST_RESULTS_DIR) image_and_flavor = conf_utils.create_tempest_resources() conf_utils.configure_tempest( self.DEPLOYMENT_DIR, -- cgit 1.2.3-korg