summaryrefslogtreecommitdiffstats
path: root/dovetail/run.py
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2017-05-23 02:22:05 -0400
committerxudan <xudan16@huawei.com>2017-05-25 23:36:55 -0400
commit5a15f57c07a5683da58f5b78e28c1a1f1bd368a4 (patch)
treedb4f6f9fdb81b323b02296157d5cd95f94cb5fa5 /dovetail/run.py
parented7f8ee3697be3751dc6cfb243cc55092ddd1dd5 (diff)
change the name of Yardstick results file and some log msg
JIRA: DOVETAIL-428 1. Change the name of Yardstick result file from opnfv_yardstick_tc019.out to dovetail.ha.tc001.out. Because opnfv_yardstick_tc019 is the name defined in Yardstick and dovetail.ha.tc001 is the name defined in Dovetail. 2. Check whether the file exists before reporting the results are stored in file. 3. Delete test cases vping_ssh, vping_userdata and sdnvpn.tc003 from the testsuite proposed_tests. Change-Id: I4cb16947729479616a03abd9e91b76f9a41a949c Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/run.py')
-rwxr-xr-xdovetail/run.py20
1 files changed, 12 insertions, 8 deletions
diff --git a/dovetail/run.py b/dovetail/run.py
index 521379d7..00376360 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -92,14 +92,18 @@ def check_tc_result(testcase, logger):
logger.error("Fail to push results to database.")
if dt_cfg.dovetail_config['report_dest'] == "file":
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)
+ result_file = os.path.join(result_dir, testcase.name() + '.out')
+ elif validate_type.lower() == 'functest':
+ result_file = os.path.join(result_dir, functest_result)
+ else:
+ logger.error("Don't support %s now.", validate_type)
+ return
+ if os.path.isfile(result_file):
+ logger.info("Results have been stored with file %s.", result_file)
+ result = Report.get_result(testcase)
+ Report.check_result(testcase, result)
+ else:
+ logger.error("Fail to store results with file %s.", result_file)
def validate_input(input_dict, check_dict, logger):