aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest/tempest.py
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-08-24 13:19:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-24 13:19:11 +0000
commit671b3356e8fc7c6219919f978a3dee6b69e8c663 (patch)
tree3e311884dde7947a743b79bb29f50d308432296e /functest/opnfv_tests/openstack/tempest/tempest.py
parentc67c6687976a486af880ece2e6831d7ef7fbbdcc (diff)
parent07e73e65dea6526ea835cbfe3f864a7e102f658c (diff)
Merge "Fix the tempest error when creating snapshot"
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 5129a56e3..c7ad4df2f 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -261,6 +261,9 @@ class TempestCommon(testcase.TestCase):
"""
logger.info("Initializing the saved state of the OpenStack deployment")
+ if not os.path.exists(conf_utils.TEMPEST_RESULTS_DIR):
+ os.makedirs(conf_utils.TEMPEST_RESULTS_DIR)
+
# Make sure that the verifier is configured
conf_utils.configure_verifier(self.DEPLOYMENT_DIR)
@@ -277,11 +280,11 @@ class TempestCommon(testcase.TestCase):
Run the Tempest cleanup utility to delete and destroy OS resources
created by Tempest.
"""
- logger.info("Initializing the saved state of the OpenStack deployment")
+ logger.info("Destroying the resources created for refstack")
- os_utils.init_tempest_cleanup(
+ os_utils.perform_tempest_cleanup(
self.DEPLOYMENT_DIR, 'tempest.conf',
- os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
+ os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
"tempest-cleanup.log")
)