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

Timestamp:

May 27, 2016 12:00:08 PM (9 years ago)

Author:

vboxsync

Message:

wuimain.py: Added a 'Test Failures' top menu. Same as 'Test Results' but with the 'Only show failed tests' option prechecked.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuibase.py (modified) (3 diffs)
• wuimain.py (modified) (3 diffs)

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

@@ -150 +150 @@
         return True;
 
+    def _isMenuMatch(self, sMenuUrl, sActionParam):
+        """ Overridable menu matcher. """
+        return sMenuUrl.find(sActionParam) > 0;
+
+    def _isSideMenuMatch(self, sSideMenuUrl, sActionParam):
+        """ Overridable side menu matcher. """
+        return sSideMenuUrl.find(sActionParam) > 0;
+
     def _generateMenus(self):
         """
@@ -161 +169 @@
             sActionParam = '%s=%s' % (self.ksParamAction, self._sAction[:cchAction]);
             for aoItem in self._aaoMenus:
-                if aoItem[1].find(sActionParam) > 0:
+                if self._isMenuMatch(aoItem[1], sActionParam):
                     aasSideMenu = aoItem[2];
                     break;
                 for asSubItem in aoItem[2]:
-                    if asSubItem[1].find(sActionParam) > 0:
+                    if self._isMenuMatch(asSubItem[1], sActionParam):
                         aasSideMenu = aoItem[2];
                         break;
@@ -190 +198 @@
         if aasSideMenu is not None:
             for asSubItem in aasSideMenu:
-                if asSubItem[1].find(sActionParam) > 0:
+                if self._isSideMenuMatch(asSubItem[1], sActionParam):
                     sSideMenuItems += '<li class="current_page_item">';
                 else:

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

@@ -266 +266 @@
         # Shorthand to keep within margins.
         sActUrlBase = self._sActionUrlBase;
+        sOFail = '&%s' % webutils.encodeUrlParams({self.ksParamOnlyFailures: True});
 
         self._aaoMenus = \
@@ -293 +294 @@
             ],
             [
+                'Test Failures',     sActUrlBase + self.ksActionResultsUnGrouped + sOFail + sExtraTimeNav,
+                [
+                    [ 'Ungrouped results',           sActUrlBase + self.ksActionResultsUnGrouped          +sOFail+sExtraTimeNav],
+                    [ 'Grouped by Scheduling Group', sActUrlBase + self.ksActionResultsGroupedBySchedGroup+sOFail+sExtraTimeNav],
+                    [ 'Grouped by Test Group',       sActUrlBase + self.ksActionResultsGroupedByTestGroup +sOFail+sExtraTimeNav],
+                    [ 'Grouped by TestBox',          sActUrlBase + self.ksActionResultsGroupedByTestBox   +sOFail+sExtraTimeNav],
+                    [ 'Grouped by Test Case',        sActUrlBase + self.ksActionResultsGroupedByTestCase  +sOFail+sExtraTimeNav],
+                    [ 'Grouped by Revision',         sActUrlBase + self.ksActionResultsGroupedByBuildRev  +sOFail+sExtraTimeNav],
+                ]
+            ],
+            [
                 '> Admin', 'admin.py?' + webutils.encodeUrlParams(self._dDbgParams), []
             ],
@@ -305 +317 @@
                                                  TestResultLogic,
                                                  WuiGroupedResultList)
+
+    def _isMenuMatch(self, sMenuUrl, sActionParam):
+        if super(WuiMain, self)._isMenuMatch(sMenuUrl, sActionParam):
+            fOnlyFailures = self.getBoolParam(self.ksParamOnlyFailures, fDefault = False);
+            return (sMenuUrl.find(self.ksParamOnlyFailures) > 0) == fOnlyFailures;
+        return False;