X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=449b2357a8aa7e5165030d228b5bc79e7685b5a6;hp=5b951890295ab074f8d586e1dc3df19f4db813b3;hb=1da19da813655f643bc3c6e4d03bed987f076f07;hpb=7b4dc49521908774f9eb2f5d287078cce06d8e49 diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 5b95189029..449b2357a8 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -390,7 +390,7 @@ def table_merged_details(table, input_data): # Temporary solution: remove NDR results from message: if bool(table.get(u'remove-ndr', False)): try: - col_data = col_data.split(u" |br| ", 1)[1] + col_data = col_data.split(u"\n", 1)[1] except IndexError: pass col_data = col_data.replace(u'\n', u' |br| ').\ @@ -917,7 +917,11 @@ def table_perf_trending_dash(table, input_data): if len(data_t) < 2: continue - classification_lst, avgs, _ = classify_anomalies(data_t) + try: + classification_lst, avgs, _ = classify_anomalies(data_t) + except ValueError as err: + logging.info(f"{err} Skipping") + return win_size = min(len(data_t), table[u"window"]) long_win_size = min(len(data_t), table[u"long-trend-window"]) @@ -1230,6 +1234,9 @@ def table_perf_trending_dash_html(table, input_data): try: with open(table[u"input-file"], u'rt') as csv_file: csv_lst = list(csv.reader(csv_file, delimiter=u',', quotechar=u'"')) + except FileNotFoundError as err: + logging.warning(f"{err}") + return except KeyError: logging.warning(u"The input file is not defined.") return @@ -1341,6 +1348,8 @@ def table_last_failed_tests(table, input_data): build = str(build) try: version = input_data.metadata(job, build).get(u"version", u"") + duration = \ + input_data.metadata(job, build).get(u"elapsedtime", u"") except KeyError: logging.error(f"Data for {job}: {build} is not present.") return @@ -1359,15 +1368,16 @@ def table_last_failed_tests(table, input_data): continue nic = groups.group(0) failed_tests.append(f"{nic}-{tst_data[u'name']}") - tbl_list.append(str(passed)) - tbl_list.append(str(failed)) + tbl_list.append(passed) + tbl_list.append(failed) + tbl_list.append(duration) tbl_list.extend(failed_tests) file_name = f"{table[u'output-file']}{table[u'output-file-ext']}" logging.info(f" Writing file: {file_name}") with open(file_name, u"wt") as file_handler: for test in tbl_list: - file_handler.write(test + u'\n') + file_handler.write(f"{test}\n") def table_failed_tests(table, input_data):