aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-08-28 12:31:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-28 12:31:52 +0000
commit71e287712d1f59e442603af244ff3230a6333e44 (patch)
tree60899151a44eb027e8ae3145280268531bdd2bb1 /functest/opnfv_tests
parentc5152e5ca372ba661f6669c67b51bbe0bb9d9e26 (diff)
parent60bc06ce24a5e6bfa6302bf1c5969e10b9e31077 (diff)
Merge "Avoid exiting when snapshot initialization failed"
Diffstat (limited to 'functest/opnfv_tests')
-rw-r--r--functest/opnfv_tests/openstack/refstack_client/refstack_client.py13
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py13
2 files changed, 16 insertions, 10 deletions
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index d4a1f072..17e02466 100644
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -224,11 +224,14 @@ class RefstackClient(testcase.TestCase):
if not self.tempestconf:
self.generate_conf()
- os_utils.init_tempest_cleanup(
- self.tempestconf.DEPLOYMENT_DIR, 'tempest.conf',
- os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
- "tempest-cleanup-init.log")
- )
+ try:
+ os_utils.init_tempest_cleanup(
+ self.tempestconf.DEPLOYMENT_DIR, 'tempest.conf',
+ os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
+ "tempest-cleanup-init.log"))
+ except Exception as err:
+ LOGGER.error(str(err))
+ return testcase.TestCase.EX_RUN_ERROR
return super(RefstackClient, self).create_snapshot()
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index c7ad4df2..6523dfca 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -267,11 +267,14 @@ class TempestCommon(testcase.TestCase):
# Make sure that the verifier is configured
conf_utils.configure_verifier(self.DEPLOYMENT_DIR)
- os_utils.init_tempest_cleanup(
- self.DEPLOYMENT_DIR, 'tempest.conf',
- os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
- "tempest-cleanup-init.log")
- )
+ try:
+ os_utils.init_tempest_cleanup(
+ self.DEPLOYMENT_DIR, 'tempest.conf',
+ os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
+ "tempest-cleanup-init.log"))
+ except Exception as err:
+ logger.error(str(err))
+ return testcase.TestCase.EX_RUN_ERROR
return super(TempestCommon, self).create_snapshot()