Avoid exiting when snapshot initialization failed

Change-Id: Ia8162d6c64847090d94f97fdab92cad2b5f059f1
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index d4a1f07..17e0246 100644 (file)
--- 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 c7ad4df..6523dfc 100644 (file)
--- 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()