diff options
Diffstat (limited to 'test/functest/run_tests.py')
| -rw-r--r-- | test/functest/run_tests.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/test/functest/run_tests.py b/test/functest/run_tests.py index be2bcb2..e05cd7f 100644 --- a/test/functest/run_tests.py +++ b/test/functest/run_tests.py @@ -10,12 +10,13 @@ import argparse import importlib -import os import sys import time +import yaml + import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -import yaml +import config as sdnvpn_config parser = argparse.ArgumentParser() @@ -26,7 +27,8 @@ args = parser.parse_args() TEST_DB_URL = ft_utils.get_functest_config('results.test_db_url') logger = ft_logger.Logger("sdnvpn-run-tests").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/sdnvpn/' + +COMMON_CONFIG = sdnvpn_config.CommonConfig() def push_results(testname, start_time, end_time, criteria, details): @@ -41,13 +43,11 @@ def push_results(testname, start_time, end_time, criteria, details): def main(): - with open(REPO_PATH + 'test/functest/config.yaml') as f: + with open(COMMON_CONFIG.config_file) as f: config_yaml = yaml.safe_load(f) testcases = config_yaml.get("testcases") - overall_details = {} overall_status = "PASS" - overall_start_time = time.time() for testcase in testcases: if testcases[testcase]['enabled']: test_name = testcase @@ -61,11 +61,9 @@ def main(): start_time = time.time() result = t.main() end_time = time.time() - duration = end_time - start_time if result < 0: status = "FAIL" overall_status = "FAIL" - overall_details.update({test_name_db: "execution error."}) else: status = result.get("status") details = result.get("details") @@ -75,18 +73,10 @@ def main(): if status == "FAIL": overall_status = "FAIL" - dic = {"duration": duration, "status": status} - overall_details.update({test_name_db: dic}) if args.report: push_results( test_name_db, start_time, end_time, status, details) - overall_end_time = time.time() - if args.report: - push_results( - "bgpvpn", overall_start_time, overall_end_time, - overall_status, overall_details) - if overall_status == "FAIL": sys.exit(-1) |