Changeset 82649 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui

Timestamp:

Dec 23, 2019 8:54:32 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135538

Message:

TestManager/wuireport.py: Graph optimizations and special stuff for the google variant.

File:

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

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

@@ -176 +176 @@
         fTailoredForGoogleCharts = True;
 
+        #
+        # Get the data and check if we have anything in the 'skipped' category.
+        #
         adPeriods = self._oModel.getSuccessRates();
 
-        sReport = '';
-
-        oTable = WuiHlpGraphDataTable('When', [ 'Succeeded', 'Skipped', 'Failed' ]);
-
-        #for i in range(len(adPeriods) - 1, -1, -1):
+        cTotalSkipped = 0;
+        for dStatuses in adPeriods:
+            cTotalSkipped += dStatuses[ReportModelBase.ksTestStatus_Skipped];
+
+        #
+        # Output some general stats before the graphs.
+        #
+        cTotalNow   = adPeriods[0][ReportModelBase.ksTestStatus_Success];
+        cTotalNow  += adPeriods[0][ReportModelBase.ksTestStatus_Skipped];
+        cSuccessNow = cTotalNow;
+        cTotalNow  += adPeriods[0][ReportModelBase.ksTestStatus_Failure];
+
+        sReport = '<p>Current success rate: ';
+        if cTotalNow > 0:
+            cSkippedNow = adPeriods[0][ReportModelBase.ksTestStatus_Skipped];
+            if cSkippedNow > 0:
+                sReport += '%s (thereof %s skipped)</p>\n' \
+                         % (self.fmtPct(cSuccessNow, cTotalNow), self.fmtPct(cSkippedNow, cTotalNow),);
+            else:
+                sReport += '%s (none skipped)</p>\n' % (self.fmtPct(cSuccessNow, cTotalNow),);
+        else:
+            sReport += 'N/A</p>\n'
+
+        #
+        # Create the data table.
+        #
+        if fTailoredForGoogleCharts:
+            if cTotalSkipped > 0:
+                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Skipped', 'Failed' ]);
+            else:
+                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Failed' ]);
+        else:
+            if cTotalSkipped > 0:
+                oTable = WuiHlpGraphDataTable('When', [ 'Succeeded', 'Skipped', 'Failed' ]);
+            else:
+                oTable = WuiHlpGraphDataTable('When', [ 'Succeeded', 'Failed' ]);
+
         for i, dStatuses in enumerate(adPeriods):
             cSuccesses = dStatuses[ReportModelBase.ksTestStatus_Success];
@@ -192 +227 @@
             sPeriod   = self._oModel.getPeriodDesc(i);
             if fTailoredForGoogleCharts:
-                oTable.addRow(sPeriod,
-                              [ cSuccesses * 100 // cTotal if cTotal else 0,
-                                cSkipped   * 100 // cTotal if cTotal else 0,
-                                cFailures  * 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, ]);
-
-            else:
-                if cTotal > 0:
+                if cTotalSkipped > 0:
+                    oTable.addRow(sPeriod,
+                                  [ cSuccesses * 100 // cTotal if cTotal else 0,
+                                    cSkipped   * 100 // cTotal if cTotal else 0,
+                                    cFailures  * 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, ]);
+                else:
+                    oTable.addRow(sPeriod,
+                                  [ cSuccesses * 100 // cTotal if cTotal else 0,
+                                    cFailures  * 100 // cTotal if cTotal else 0, ],
+                                  [ self.fmtPct(cSuccesses, cTotal) if cSuccesses else None,
+                                    self.fmtPct(cFailures,  cTotal) if cFailures  else None, ]);
+            elif cTotal > 0:
+                if cTotalSkipped > 0:
                     oTable.addRow(sPeriod,
                                   [ cSuccesses * 100 // cTotal,
@@ -210 +251 @@
                                     self.fmtPctWithHits(cFailures, cTotal), ]);
                 else:
-                    oTable.addRow(sPeriod, [ 0, 0, 0 ], [ '0%', '0%', '0%' ]);
-
-        cTotalNow  = adPeriods[0][ReportModelBase.ksTestStatus_Success];
-        cTotalNow += adPeriods[0][ReportModelBase.ksTestStatus_Skipped];
-        cSuccessNow = cTotalNow;
-        cTotalNow += adPeriods[0][ReportModelBase.ksTestStatus_Failure];
-        sReport += '<p>Current success rate: ';
-        if cTotalNow > 0:
-            sReport += '%s%% (thereof %s%% skipped)</p>\n' \
-                     % ( cSuccessNow * 100 // cTotalNow, adPeriods[0][ReportModelBase.ksTestStatus_Skipped] * 100 // cTotalNow);
-        else:
-            sReport += 'N/A</p>\n'
-
+                    oTable.addRow(sPeriod,
+                                  [ cSuccesses * 100 // cTotal,
+                                    cFailures * 100 // cTotal, ],
+                                  [ self.fmtPctWithHits(cSuccesses, cTotal),
+                                    self.fmtPctWithHits(cFailures, cTotal), ]);
+            elif cTotalSkipped > 0:
+                oTable.addRow(sPeriod, [ 0, 0, 0 ], [ '0%', '0%', '0%' ]);
+            else:
+                oTable.addRow(sPeriod, [ 0, 0 ], [ '0%', '0%' ]);
+
+        #
+        # Render the graph.
+        #
         oGraph = WuiHlpBarGraph('success-rate', oTable, self._oDisp);
         oGraph.setRangeMax(100);
@@ -231 +272 @@
         #
         if fTailoredForGoogleCharts:
-            oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Skipped', 'Failed' ]);
+            if cTotalSkipped > 0:
+                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Skipped', 'Failed' ]);
+            else:
+                oTable = WuiHlpGraphDataTable(None, [ 'Succeeded', 'Failed' ]);
             for i, dStatuses in enumerate(adPeriods):
                 cSuccesses = dStatuses[ReportModelBase.ksTestStatus_Success];
@@ -237 +281 @@
                 cSkipped   = dStatuses[ReportModelBase.ksTestStatus_Skipped];
 
-                oTable.addRow(self._oModel.getPeriodDesc(i),
-                              [ cSuccesses, cSkipped, cFailures, ],
-                              [ str(cSuccesses) if cSuccesses > 0 else None,
-                                str(cSkipped) if cSkipped > 0 else None,
-                                str(cFailures) if cFailures > 0 else None, ]);
+                if cTotalSkipped > 0:
+                    oTable.addRow(None, #self._oModel.getPeriodDesc(i),
+                                  [ cSuccesses, cSkipped, cFailures, ],
+                                  [ str(cSuccesses) if cSuccesses > 0 else None,
+                                    str(cSkipped) if cSkipped > 0 else None,
+                                    str(cFailures) if cFailures > 0 else None, ]);
+                else:
+                    oTable.addRow(None, #self._oModel.getPeriodDesc(i),
+                                  [ cSuccesses, cFailures, ],
+                                  [ str(cSuccesses) if cSuccesses > 0 else None,
+                                    str(cFailures) if cFailures > 0 else None, ]);
             oGraph = WuiHlpBarGraph('success-numbers', oTable, self._oDisp);
+            oGraph.invertYDirection();
             sReport += oGraph.renderGraph();