diff options
Diffstat (limited to 'dovetail/report.py')
| -rw-r--r-- | dovetail/report.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/dovetail/report.py b/dovetail/report.py index fa6a0ba4..41f14b53 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -14,6 +14,7 @@ import re import os import datetime import tarfile +import time from pbr import version @@ -54,11 +55,8 @@ class Report(object): report_obj['duration'] = duration report_obj['testcases_list'] = [] - testarea_list = [] - for value in testsuite_yaml['testcases_list']: - if value is not None and (testarea == 'full' or testarea in value): - testarea_list.append(value) - for testcase_name in testarea_list: + testcase_list = Testcase.get_testcase_list(testsuite_yaml, testarea) + for testcase_name in testcase_list: testcase = Testcase.get(testcase_name) testcase_inreport = {} testcase_inreport['name'] = testcase_name @@ -79,7 +77,7 @@ class Report(object): 'result': testcase.sub_testcase_passed(sub_test) }) report_obj['testcases_list'].append(testcase_inreport) - cls.logger.info(json.dumps(report_obj)) + cls.logger.debug(json.dumps(report_obj)) return report_obj @classmethod @@ -165,14 +163,19 @@ class Report(object): @classmethod def save_logs(cls): - logs_gz = "logs.tar.gz" + file_suffix = time.strftime('%d_%H_%M', time.localtime(time.time())) + logs_gz = "logs_{}.tar.gz".format(file_suffix) result_dir = dt_cfg.dovetail_config['result_dir'] - with tarfile.open(os.path.join(result_dir, logs_gz), "w:gz") as f_out: + cwd = os.getcwd() + os.chdir(os.path.join(result_dir, '..')) + tar_file = os.path.join(result_dir, '..', logs_gz) + with tarfile.open(tar_file, "w:gz") as f_out: files = os.listdir(result_dir) for f in files: if f not in ['workspace']: - f_out.add(os.path.join(result_dir, f)) + f_out.add(os.path.join('results', f)) + os.chdir(cwd) # save to disk as default @classmethod @@ -260,7 +263,8 @@ class FunctestCrawler(object): for jsonfile in f: try: data = json.loads(jsonfile) - if testcase_name == data['case_name'] and \ + if (testcase_name == data['case_name'] or + data['project_name'] == "sdnvpn") and \ build_tag == data['build_tag']: criteria = data['criteria'] timestart = data['start_date'] |