X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=b7f267847c2541175761362c3a2ccca5d3d0e18d;hb=c81eac1e36b37c78f144a4218c231da846a908f6;hp=3c77ea89f1ae3978ef59fecb9251515668fd3626;hpb=0ba8b76dc5ac35b39b1a9200c1c81410d632d8aa;p=csit.git diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 3c77ea89f1..b7f267847c 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,7 +317,16 @@ 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 \ + if column[u"data"].split(u" ")[1] in (u"name", ): + if len(col_data) > 30: + col_data_lst = col_data.split(u"-") + half = int(len(col_data_lst) / 2) + col_data = f"{u'-'.join(col_data_lst[:half])}\n" \ + f"{u'-'.join(col_data_lst[half:])}" + col_data = f" |prein| {col_data} |preout| " + elif column[u"data"].split(u" ")[1] in (u"msg", ): + col_data = f" |prein| {col_data} |preout| " + elif column[u"data"].split(u" ")[1] in \ (u"conf-history", u"show-run"): col_data = col_data.replace(u" |br| ", u"", 1) col_data = f" |prein| {col_data[:-5]} |preout| " @@ -391,6 +400,8 @@ 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", u"msg"): + 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)