summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongbo tian <hongbo.tianhongbo@huawei.com>2017-04-21 03:43:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-21 03:43:55 +0000
commitfaa79a9c2ffe8e1bd7ffef6e1b99ca30bd549641 (patch)
tree0de38cf66153e2b0506309b7ff1c60525f0b86fb
parentb1030e6099f38b226c8ef86a2a4711aca8c1822a (diff)
parent9a1f3fc0cc0e6ca9114dff909f5a2ba58a41bf31 (diff)
Merge "put dovetail test result back in log and not generte report file"
-rw-r--r--dovetail/report.py2
-rwxr-xr-xdovetail/run.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/dovetail/report.py b/dovetail/report.py
index dc53d307..3dd636c7 100644
--- a/dovetail/report.py
+++ b/dovetail/report.py
@@ -154,7 +154,7 @@ class Report(object):
report_txt += sub_report[key]
cls.logger.info(report_txt)
- cls.save(report_txt)
+ # cls.save(report_txt)
return report_txt
# save to disk as default
diff --git a/dovetail/run.py b/dovetail/run.py
index 7386790c..556f8137 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -95,8 +95,8 @@ def check_tc_result(testcase, logger):
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 = Report.get_result(testcase)
+ Report.check_result(testcase, result)
def validate_input(input_dict, check_dict, logger):
@@ -231,9 +231,9 @@ def main(*args, **kwargs):
if testsuite_validation and testarea_validation:
testsuite_yaml = load_testsuite(kwargs['testsuite'])
load_testcase()
- run_test(testsuite_yaml, testarea, logger)
- # if dt_cfg.dovetail_config['report_dest'] == "file":
- # Report.generate(testsuite_yaml, testarea, duration)
+ 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)