X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=b09b820419f9b4866874e900bddd4e5b97d5ef8a;hp=273288c1aacf90e485d57164d2e93b1caa90a764;hb=ae49a33a8ee6d873521420e73c202b86b4acf6a0;hpb=55cad0badce981ec3f0b544e687d898eba689368 diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 273288c1aa..b09b820419 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -2176,8 +2176,10 @@ def table_weekly_comparison(table, in_data): header[1].insert( 1, in_data.metadata(job_name, build_nr).get(u"generated", u"") ) + logging.info( + in_data.metadata(job_name, build_nr).get(u"version", u"ERROR")) header[0].insert( - 1, in_data.metadata(job_name, build_nr).get(u"version", u"") + 1, in_data.metadata(job_name, build_nr).get("version", build_nr) ) for tst_name, tst_data in build.items(): @@ -2219,9 +2221,7 @@ def table_weekly_comparison(table, in_data): if ref_data is None or cmp_data is None: cmp_dict[tst_name].append(float(u'nan')) else: - cmp_dict[tst_name].append( - relative_change(ref_data, cmp_data) - ) + cmp_dict[tst_name].append(relative_change(ref_data, cmp_data)) tbl_lst_none = list() tbl_lst = list() @@ -2265,17 +2265,31 @@ def table_weekly_comparison(table, in_data): txt_file_name = f"{table[u'output-file']}.txt" logging.info(f" Writing the file {txt_file_name}") - convert_csv_to_pretty_txt(csv_file_name, txt_file_name, delimiter=u",") + try: + convert_csv_to_pretty_txt(csv_file_name, txt_file_name, delimiter=u",") + except Exception as err: + logging.error(repr(err)) + for hdr in header: + logging.info(",".join(hdr)) + for test in tbl_lst: + logging.info(",".join( + [ + str(item).replace(u"None", u"-").replace(u"nan", u"-"). + replace(u"null", u"-") for item in test + ] + )) # Reorganize header in txt table txt_table = list() - with open(txt_file_name, u"rt", encoding='utf-8') as file_handler: - for line in list(file_handler): - txt_table.append(line) try: + with open(txt_file_name, u"rt", encoding='utf-8') as file_handler: + for line in list(file_handler): + txt_table.append(line) txt_table.insert(5, txt_table.pop(2)) with open(txt_file_name, u"wt", encoding='utf-8') as file_handler: file_handler.writelines(txt_table) + except FileNotFoundError as err: + logging.error(repr(err)) except IndexError: pass