Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increase ram for tempest tests (aarch64)"
[functest.git]
/
functest
/
ci
/
run_tests.py
diff --git
a/functest/ci/run_tests.py
b/functest/ci/run_tests.py
index
f920e70
..
5793c04
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.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
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_clean as os_clean
@@
-32,13
+31,6
@@
from functest.utils.constants import CONST
logger = ft_logger.Logger("run_tests").getLogger()
logger = ft_logger.Logger("run_tests").getLogger()
-""" global variables """
-EXEC_SCRIPT = ("%s/functest/ci/exec_test.sh" % CONST.dir_repo_functest)
-
-# This will be the return code of this script. If any of the tests fails,
-# this variable will change to Result.EX_ERROR
-
-
class Result(enum.Enum):
EX_OK = os.EX_OK
EX_ERROR = -1
class Result(enum.Enum):
EX_OK = os.EX_OK
EX_ERROR = -1
@@
-91,16
+83,12
@@
def source_rc_file():
for key, value in os.environ.iteritems():
if re.search("OS_", key):
if key == 'OS_AUTH_URL':
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':
CONST.OS_AUTH_URL = value
elif key == 'OS_USERNAME':
- ft_constants.OS_USERNAME = value
CONST.OS_USERNAME = value
elif key == 'OS_TENANT_NAME':
CONST.OS_USERNAME = value
elif key == 'OS_TENANT_NAME':
- ft_constants.OS_TENANT_NAME = value
CONST.OS_TENANT_NAME = value
elif key == 'OS_PASSWORD':
CONST.OS_TENANT_NAME = value
elif key == 'OS_PASSWORD':
- ft_constants.OS_PASSWORD = value
CONST.OS_PASSWORD = value
CONST.OS_PASSWORD = value
@@
-119,7
+107,7
@@
def update_test_info(test_name, result, duration):
"duration": duration})
"duration": duration})
-def get_run_dict
_if_defined
(testname):
+def get_run_dict(testname):
try:
dict = ft_utils.get_dict_by_test(testname)
if not dict:
try:
dict = ft_utils.get_dict_by_test(testname)
if not dict:
@@
-143,26
+131,27
@@
def run_test(test, tier_name, testcases=None):
logger.debug("\n%s" % test)
source_rc_file()
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"
generate_os_snapshot()
flags = (" -t %s" % (test_name))
if GlobalVariables.REPORT_FLAG:
flags += " -r"
- result = testcase
_base.TestcaseB
ase.EX_RUN_ERROR
- run_dict = get_run_dict
_if_defined
(test_name)
+ result = testcase
.TestC
ase.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'])
if run_dict:
try:
module = importlib.import_module(run_dict['module'])
cls = getattr(module, run_dict['class'])
- test_case = cls()
+ test_case = cls(case_name=test_name)
+
try:
kwargs = run_dict['args']
result = test_case.run(**kwargs)
except KeyError:
result = test_case.run()
try:
kwargs = run_dict['args']
result = test_case.run(**kwargs)
except KeyError:
result = test_case.run()
- if result == testcase
_base.TestcaseB
ase.EX_OK:
+ if result == testcase
.TestC
ase.EX_OK:
if GlobalVariables.REPORT_FLAG:
test_case.push_to_db()
result = test_case.check_criteria()
if GlobalVariables.REPORT_FLAG:
test_case.push_to_db()
result = test_case.check_criteria()
@@
-173,14
+162,11
@@
def run_test(test, tier_name, testcases=None):
logger.exception("Cannot get class {}".format(
run_dict['class']))
else:
logger.exception("Cannot get class {}".format(
run_dict['class']))
else:
- cmd = ("%s%s" % (EXEC_SCRIPT, flags))
- logger.info("Executing command {} because {} "
- "doesn't implement the new framework".format(
- cmd, test_name))
- result = ft_utils.execute_command(cmd)
+ raise Exception("Cannot import the class for the test case.")
- if GlobalVariables.CLEAN_FLAG:
+ if
test.needs_clean() and
GlobalVariables.CLEAN_FLAG:
cleanup()
cleanup()
+
end = datetime.datetime.now()
duration = (end - start).seconds
duration_str = ("%02d:%02d" % divmod(duration, 60))
end = datetime.datetime.now()
duration = (end - start).seconds
duration_str = ("%02d:%02d" % divmod(duration, 60))