Report: Format of tables

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

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 73b9ea1..5d9234e 100644 (file)
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -423,14 +423,19 @@ class ExecutionChecker(ResultVisitor):
                 return u""
 
             if hdr_lat_1 and hdr_lat_2:
-                return (
-                    f"{hdr_lat_1.get_value_at_percentile(50.0)} "
-                    f"{hdr_lat_1.get_value_at_percentile(90.0)} "
-                    f"{hdr_lat_1.get_value_at_percentile(99.0)} , "
-                    f"{hdr_lat_2.get_value_at_percentile(50.0)} "
-                    f"{hdr_lat_2.get_value_at_percentile(90.0)} "
-                    f"{hdr_lat_2.get_value_at_percentile(99.0)}"
-                )
+                hdr_lat_1_50 = hdr_lat_1.get_value_at_percentile(50.0)
+                hdr_lat_1_90 = hdr_lat_1.get_value_at_percentile(90.0)
+                hdr_lat_1_99 = hdr_lat_1.get_value_at_percentile(99.0)
+                hdr_lat_2_50 = hdr_lat_2.get_value_at_percentile(50.0)
+                hdr_lat_2_90 = hdr_lat_2.get_value_at_percentile(90.0)
+                hdr_lat_2_99 = hdr_lat_2.get_value_at_percentile(99.0)
+
+                if (hdr_lat_1_50 + hdr_lat_1_90 + hdr_lat_1_99 +
+                        hdr_lat_2_50 + hdr_lat_2_90 + hdr_lat_2_99):
+                    return (
+                        f"{hdr_lat_1_50} {hdr_lat_1_90} {hdr_lat_1_99} , "
+                        f"{hdr_lat_2_50} {hdr_lat_2_90} {hdr_lat_2_99}"
+                    )
 
             return u""
 
@@ -446,13 +451,11 @@ class ExecutionChecker(ResultVisitor):
             pdr_lat_90 = f"\n5. {pdr_lat_90}" if pdr_lat_90 else u""
 
             return (
-                u" |prein| "
                 f"1. {(data[u'ndr_low'] / 1e6):.2f} {data[u'ndr_low_b']:.2f}"
                 f"\n2. {(data[u'pdr_low'] / 1e6):.2f} {data[u'pdr_low_b']:.2f}"
                 f"{pdr_lat_10}"
                 f"{pdr_lat_50}"
                 f"{pdr_lat_90}"
-                u" |preout| "
             )
         except (AttributeError, IndexError, ValueError, KeyError):
             return msg
@@ -1030,6 +1033,8 @@ class ExecutionChecker(ResultVisitor):
                     }
                 except (AttributeError, IndexError, ValueError, TypeError):
                     test_result[u"status"] = u"FAIL"
+            elif u"DEVICETEST" in tags:
+                test_result[u"type"] = u"DEVICETEST"
             else:
                 test_result[u"status"] = u"FAIL"
                 self._data[u"tests"][self._test_id] = test_result