Changeset 98551 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Feb 13, 2023 8:49:37 PM (2 years ago)

Author:

vboxsync

Message:

testmanager: Switch the 'skipped' and 'failure' columns, so that well always have the 'failure' one as the red one with google bar charts. bugref:10364

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuireport.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testmanager/webui/wuireport.py

@@ -219 +219 @@
         if fTailoredForGoogleCharts:
             if cTotalSkipped > 0:
-                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Skipped', 'Failed' ]);
+                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Failed', 'Skipped' ]);
             else:
                 oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Failed' ]);
         else:
             if cTotalSkipped > 0:
-                oTable = WuiHlpGraphDataTable('When', [ 'Succeeded', 'Skipped', 'Failed' ]);
+                oTable = WuiHlpGraphDataTable('When', [ 'Succeeded', 'Failed', 'Skipped' ]);
             else:
                 oTable = WuiHlpGraphDataTable('When', [ 'Succeeded', 'Failed' ]);
@@ -240 +240 @@
                     oTable.addRow(sPeriod,
                                   [ cSuccesses * 100 // cTotal if cTotal else 0,
-                                    cSkipped   * 100 // cTotal if cTotal else 0,
-                                    cFailures  * 100 // cTotal if cTotal else 0, ],
+                                    cFailures  * 100 // cTotal if cTotal else 0,
+                                    cSkipped   * 100 // cTotal if cTotal else 0, ],
                                   [ self.fmtPct(cSuccesses, cTotal) if cSuccesses else None,
-                                    self.fmtPct(cSkipped,   cTotal) if cSkipped   else None,
-                                    self.fmtPct(cFailures,  cTotal) if cFailures  else None, ]);
+                                    self.fmtPct(cFailures,  cTotal) if cFailures  else None,
+                                    self.fmtPct(cSkipped,   cTotal) if cSkipped   else None, ]);
                 else:
                     oTable.addRow(sPeriod,
@@ -255 +255 @@
                     oTable.addRow(sPeriod,
                                   [ cSuccesses * 100 // cTotal,
-                                    cSkipped * 100 // cTotal,
-                                    cFailures * 100 // cTotal, ],
+                                    cFailures * 100 // cTotal,
+                                    cSkipped * 100 // cTotal, ],
                                   [ self.fmtPctWithHits(cSuccesses, cTotal),
-                                    self.fmtPctWithHits(cSkipped, cTotal),
-                                    self.fmtPctWithHits(cFailures, cTotal), ]);
+                                    self.fmtPctWithHits(cFailures, cTotal),
+                                    self.fmtPctWithHits(cSkipped, cTotal), ]);
                 else:
                     oTable.addRow(sPeriod,
@@ -283 +283 @@
         if fTailoredForGoogleCharts:
             if cTotalSkipped > 0:
-                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Skipped', 'Failed' ]);
+                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Failed', 'Skipped' ]);
             else:
                 oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Failed' ]);
@@ -295 +295 @@
                                   [ cSuccesses, cSkipped, cFailures, ],
                                   [ str(cSuccesses) if cSuccesses > 0 else None,
-                                    str(cSkipped) if cSkipped > 0 else None,
-                                    str(cFailures) if cFailures > 0 else None, ]);
+                                    str(cFailures) if cFailures > 0 else None,
+                                    str(cSkipped) if cSkipped > 0 else None, ]);
                 else:
                     oTable.addRow(None, #self._oModel.getPeriodDesc(i),