diff options
author | hongbo tian <hongbo.tianhongbo@huawei.com> | 2017-04-13 06:32:29 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-04-13 06:32:29 +0000 |
commit | 920281280fd055e796d8eec8b47416ec9a2d457f (patch) | |
tree | bc6e2d8e2402ac737a2e0c6147496e9d73cd12e6 /dovetail/run.py | |
parent | 52503b8bca1025a3412385b45591999530cedc40 (diff) | |
parent | 4d98856b87edbf784b12b375b5d30ab9f401d525 (diff) |
Merge "dovetail tool: bugfix: test cases are erroneously judged"
Diffstat (limited to 'dovetail/run.py')
-rwxr-xr-x | dovetail/run.py | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index 98a00085..5a902d7f 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -71,9 +71,14 @@ def run_test(testsuite, testarea, logger): def check_tc_result(testcase, logger): + result_dir = dt_cfg.dovetail_config['result_dir'] + validate_type = testcase.validate_type() + functest_result = dt_cfg.dovetail_config['functest']['result']['file_path'] if dt_cfg.dovetail_config['report_dest'].startswith("http"): - if testcase.validate_type() == 'yardstick': - logger.info("Results have been stored with files.") + if validate_type.lower() == 'yardstick': + logger.info("Results have been stored with file %s.", + os.path.join(result_dir, + testcase.validate_testcase() + '.out')) else: if dt_utils.check_db_results(dt_cfg.dovetail_config['report_dest'], dt_cfg.dovetail_config['build_tag'], @@ -83,9 +88,15 @@ def check_tc_result(testcase, logger): else: logger.error("Fail to push results to database.") if dt_cfg.dovetail_config['report_dest'] == "file": - logger.info("Results have been stored with files.") - result = Report.get_result(testcase) - Report.check_result(testcase, result) + if validate_type.lower() == 'yardstick': + logger.info("Results have been stored with file %s.", + os.path.join(result_dir, + testcase.validate_testcase() + '.out')) + if validate_type.lower() == 'functest': + logger.info("Results have been stored with file %s.", + os.path.join(result_dir, functest_result)) + # result = Report.get_result(testcase) + # Report.check_result(testcase, result) def validate_input(input_dict, check_dict, logger): @@ -218,9 +229,9 @@ def main(*args, **kwargs): if testsuite_validation and testarea_validation: testsuite_yaml = load_testsuite(kwargs['testsuite']) load_testcase() - duration = run_test(testsuite_yaml, testarea, logger) - if dt_cfg.dovetail_config['report_dest'] == "file": - Report.generate(testsuite_yaml, testarea, duration) + run_test(testsuite_yaml, testarea, logger) + # if dt_cfg.dovetail_config['report_dest'] == "file": + # Report.generate(testsuite_yaml, testarea, duration) else: logger.error('invalid input commands, testsuite %s testarea %s', kwargs['testsuite'], testarea) |