X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=576766952b9297b82271afbe325cb64e7551923d;hp=3c77ea89f1ae3978ef59fecb9251515668fd3626;hb=b47c8f8ed56880eda3f64cf06abd47155ea97db0;hpb=0ba8b76dc5ac35b39b1a9200c1c81410d632d8aa diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 3c77ea89f1..576766952b 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -34,7 +34,7 @@ from pal_utils import mean, stdev, relative_change, classify_anomalies, \ convert_csv_to_pretty_txt, relative_change_stdev -REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*[a-z]*)-') +REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*[a-z]*)') def generate_tables(spec, data): @@ -317,6 +317,8 @@ def table_details(table, input_data): try: col_data = str(data[job][build][test][column[ u"data"].split(" ")[1]]).replace(u'"', u'""') + if column[u"data"].split(u" ")[1] in (u"name", ): + col_data = f" |prein| {col_data} |preout| " if column[u"data"].split(u" ")[1] in \ (u"conf-history", u"show-run"): col_data = col_data.replace(u" |br| ", u"", 1) @@ -391,8 +393,10 @@ def table_merged_details(table, input_data): col_data = col_data.replace( u"No Data", u"Not Captured " ) + if column[u"data"].split(u" ")[1] in (u"name", ): + col_data = f" |prein| {col_data} |preout| " if column[u"data"].split(u" ")[1] in \ - (u"conf-history", u"show-run"): + (u"conf-history", u"show-run", u"msg"): col_data = col_data.replace(u" |br| ", u"", 1) col_data = f" |prein| {col_data[:-5]} |preout| " row_lst.append(f'"{col_data}"')