Make tempest cleanup resources after running

[functest.git] / functest / ci / run_tests.py

diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 0d1b17d..37b90f9 100755 (executable)
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -18,8 +18,7 @@ import sys
 
 import functest.ci.generate_report as generate_report
 import functest.ci.tier_builder as tb
-import functest.core.testcase_base as testcase_base
-import functest.utils.functest_constants as ft_constants
+import functest.core.testcase as testcase
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_clean as os_clean
@@ -84,16 +83,12 @@ def source_rc_file():
     for key, value in os.environ.iteritems():
         if re.search("OS_", key):
             if key == 'OS_AUTH_URL':
-                ft_constants.OS_AUTH_URL = value
                 CONST.OS_AUTH_URL = value
             elif key == 'OS_USERNAME':
-                ft_constants.OS_USERNAME = value
                 CONST.OS_USERNAME = value
             elif key == 'OS_TENANT_NAME':
-                ft_constants.OS_TENANT_NAME = value
                 CONST.OS_TENANT_NAME = value
             elif key == 'OS_PASSWORD':
-                ft_constants.OS_PASSWORD = value
                 CONST.OS_PASSWORD = value
 
 
@@ -136,26 +131,27 @@ def run_test(test, tier_name, testcases=None):
     logger.debug("\n%s" % test)
     source_rc_file()
 
-    if GlobalVariables.CLEAN_FLAG:
+    if test.needs_clean() and GlobalVariables.CLEAN_FLAG:
         generate_os_snapshot()
 
     flags = (" -t %s" % (test_name))
     if GlobalVariables.REPORT_FLAG:
         flags += " -r"
 
-    result = testcase_base.TestcaseBase.EX_RUN_ERROR
+    result = testcase.TestCase.EX_RUN_ERROR
     run_dict = get_run_dict(test_name)
     if run_dict:
         try:
             module = importlib.import_module(run_dict['module'])
             cls = getattr(module, run_dict['class'])
             test_case = cls()
+
             try:
                 kwargs = run_dict['args']
                 result = test_case.run(**kwargs)
             except KeyError:
                 result = test_case.run()
-            if result == testcase_base.TestcaseBase.EX_OK:
+            if result == testcase.TestCase.EX_OK:
                 if GlobalVariables.REPORT_FLAG:
                     test_case.push_to_db()
                 result = test_case.check_criteria()
@@ -168,8 +164,9 @@ def run_test(test, tier_name, testcases=None):
     else:
         raise Exception("Cannot import the class for the test case.")
 
-    if GlobalVariables.CLEAN_FLAG:
+    if test.needs_clean() and GlobalVariables.CLEAN_FLAG:
         cleanup()
+
     end = datetime.datetime.now()
     duration = (end - start).seconds
     duration_str = ("%02d:%02d" % divmod(duration, 60))