trending: legend positioning

[csit.git] / resources / tools / presentation / generator_cpta.py

diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index 0bef38d..923d56b 100644 (file)
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -855,9 +855,16 @@ def _generate_all_charts(spec, input_data):
             with open(file_name, u'w') as txt_file:
                 for test_name, classification in job_data.items():
                     if classification == u"regression":
-                        tst = test_name.split(" ")[1].split(".")[1:]
-                        nic = tst[0].split("-")[0]
-                        tst_name = f"{nic}-{tst[1]}"
+                        if u"2n" in test_name:
+                            test_name = test_name.split("-", 2)
+                            tst = test_name[2].split(".")[-1]
+                            nic = test_name[1]
+                            tst_name = f"{nic}-{tst}"
+                        else:
+                            test_name = test_name.split("-", 1)
+                            tst = test_name[1].split(".")[-1]
+                            nic = test_name[0].split(".")[-1]
+                            tst_name = f"{nic}-{tst}"
 
                         for line in data:
                             if tst_name in line:
@@ -871,16 +878,23 @@ def _generate_all_charts(spec, input_data):
                     if classification in (u"regression", u"outlier"):
                         result = u"FAIL"
 
-                txt_file.write(f"{legend_str}regression in percentage ]")
+            txt_file.write(f"\n{legend_str}regression in percentage ]")
 
             file_name = \
                 f"{spec.cpta[u'output-file']}/progressions-{job_name}.txt"
             with open(file_name, u'w') as txt_file:
                 for test_name, classification in job_data.items():
                     if classification == u"progression":
-                        tst = test_name.split(" ")[1].split(".")[1:]
-                        nic = tst[0].split("-")[0]
-                        tst_name = f"{nic}-{tst[1]}"
+                        if u"2n" in test_name:
+                            test_name = test_name.split("-", 2)
+                            tst = test_name[2].split(".")[-1]
+                            nic = test_name[1]
+                            tst_name = f"{nic}-{tst}"
+                        else:
+                            test_name = test_name.split("-", 1)
+                            tst = test_name[1].split(".")[-1]
+                            nic = test_name[0].split(".")[-1]
+                            tst_name = f"{nic}-{tst}"
 
                         for line in data:
                             if tst_name in line:
@@ -891,7 +905,7 @@ def _generate_all_charts(spec, input_data):
                                 txt_file.write(f"{tst_name} [ {trend}M | "
                                                f"#{number} | {ltc}% ]\n")
 
-                txt_file.write(f"{legend_str}progression in percentage ]")
+            txt_file.write(f"\n{legend_str}progression in percentage ]")
     else:
         result = u"FAIL"