Add panel resolution value in merge_test_matrix script. (#64)

Initial Test:https://warthogs.atlassian.net/browse/OEMQA-3881 Modify merge_test_matrix: https://warthogs.atlassian.net/browse/OEMQA-3887
canonical · Mar 5, 2024 · a59e517 · a59e517
1 parent 73625a8
commit a59e517
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/Tools/PC/merge_test_matrix/merge_test_matrix.py b/Tools/PC/merge_test_matrix/merge_test_matrix.py
@@ -26,6 +26,7 @@
         "Bluetooth": "BT",
         "WWAN": "WWAN",
         "Screen": "Touchscreen",
+        "Panel Resolution": "Panel-Resolution",
         "Touchpad": "Touchpad",
         "Webcam": "Webcam",
         "Fingerprint": "Fingerprint",
@@ -130,6 +131,10 @@ def touchscreen(self):
         else:
             return "N/A"
 
+    @property
+    def panel(self):
+        return self._data.get("Panel-Resolution")
+
     @property
     def webcam(self):
         webcams = self._data.get("Webcam")
@@ -367,6 +372,7 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
             "Bluetooth",
             "WWAN",
             "Screen",
+            "Panel Resolution",
             "Touchpad",
             "Webcam",
             "Fingerprint",
@@ -400,10 +406,11 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
             "bluetooth": 11,
             "wwan": 12,
             "touchscreen": 13,
-            "touchpad": 14,
-            "webcam": 15,
-            "fingerprint": 16,
-            "disk": 17,
+            "panel": 14,
+            "touchpad": 15,
+            "webcam": 16,
+            "fingerprint": 17,
+            "disk": 18,
         }
         tmp_data = {}
 
@@ -434,11 +441,11 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
             )
             # Write empty data for other
             worksheet.write(
-                18, row, "",
+                19, row, "",
                 WorkbookFormater.default_format(workbook))
             # Write empty data for test scope
             worksheet.write(
-                19, row, "",
+                20, row, "",
                 WorkbookFormater.default_format(workbook))
 
             if no_highlight:
@@ -479,19 +486,23 @@ def generate_test_matrix_v2(test_results, filename, no_highlight):
                     WorkbookFormater.default_format(workbook),
                 )
                 worksheet.write(
-                    14, row, parser.touchpad,
+                    14, row, parser.panel,
+                    WorkbookFormater.default_format(workbook)
+                )
+                worksheet.write(
+                    15, row, parser.touchpad,
                     WorkbookFormater.default_format(workbook)
                 )
                 worksheet.write(
-                    15, row, parser.webcam,
+                    16, row, parser.webcam,
                     WorkbookFormater.default_format(workbook)
                 )
                 worksheet.write(
-                    16, row, parser.fingerprint,
+                    17, row, parser.fingerprint,
                     WorkbookFormater.default_format(workbook),
                 )
                 worksheet.write(
-                    17, row, parser.disk,
+                    18, row, parser.disk,
                     WorkbookFormater.default_format(workbook)
                 )
             else: