Changeset 65051 in vbox for trunk/src/VBox/ValidationKit/testmanager/core

Timestamp:

Jan 2, 2017 11:55:03 AM (8 years ago)

Author:

vboxsync

Message:

testmanager: Test result filtering - work in progress.

Location:

trunk/src/VBox/ValidationKit/testmanager/core

Files:

• base.py (modified) (3 diffs)
• testresults.py (modified) (9 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/base.py

@@ -1186 +1186 @@
     ## @}
 
-    def __init__(self, sName, sVarNm = None, sTypeNm = ksType_UInt, sState = ksState_NotSelected, sKind = ksKind_AnyOf):
+    def __init__(self, sName, sVarNm = None, sType = ksType_UInt, sState = ksState_NotSelected, sKind = ksKind_AnyOf):
+        assert len(sVarNm) in (2,3); # required by wuimain.py
         self.sName      = sName;
         self.sState     = sState;
         self.sVarNm     = sVarNm if sVarNm is not None else sName;
-        self.sTypeNm    = sTypeNm;
+        self.sType      = sType;
         self.sKind      = sKind;
         self.aoSelected = []; # Single value, any type.
@@ -1201 +1202 @@
 
     Filters are used to narrow down data that is displayed in a list or
-    report.  It differs a little from ModelDataBase in that it's not tied to a
-    database table, but one or more database queries that are typically very
-    complicated.
+    report.  This class differs a little from ModelDataBase in that it is not
+    tied to a database table, but one or more database queries that are
+    typically rather complicated.
 
     The filter object has two roles:
@@ -1234 +1235 @@
             if oCriterion.sType == FilterCriterion.ksType_UInt:
                 oCriterion.aoSelected = oDisp.getListOfIntParams(oCriterion.sVarNm, iMin = 0, aiDefaults = []);
+            elif oCriterion.sType == FilterCriterion.ksType_String:
+                oCriterion.aoSelected = oDisp.getListOfStrParams(oCriterion.sVarNm, asDefaults = []);
             else:
-                oCriterion.aoSelected = oDisp.getListOfStrParams(oCriterion.sVarNm, asDefaults = []);
-            if len(oCriterion.aoSelected):
-                oCriterion.sState = FilterCriterion.ksState_Selected;
+                assert False;
+            if len(oCriterion.aoSelected) > 0:
+                oCriterion.sState     = FilterCriterion.ksState_Selected;
             else:
-                oCriterion.sState = FilterCriterion.ksState_NotSelected;
+                oCriterion.sState     = FilterCriterion.ksState_NotSelected;
         return self;
-
 
 

trunk/src/VBox/ValidationKit/testmanager/core/testresults.py

@@ -37 +37 @@
 from common                                 import constants;
 from testmanager                            import config;
-from testmanager.core.base                  import ModelDataBase, ModelLogicBase, ModelDataBaseTestCase, TMExceptionBase, \
-                                                   TMTooManyRows, TMRowNotFound;
+from testmanager.core.base                  import ModelDataBase, ModelLogicBase, ModelDataBaseTestCase, ModelFilterBase, \
+                                                   FilterCriterion, FilterCriterionValueAndDescription, \
+                                                   TMExceptionBase, TMTooManyRows, TMRowNotFound;
 from testmanager.core.testgroup             import TestGroupData;
 from testmanager.core.build                 import BuildDataEx, BuildCategoryData;
@@ -638 +639 @@
     """Hanging offence committed by test case."""
     pass;
+
+
+class TestResultFilter(ModelFilterBase):
+    """
+    Test result filter.
+    """
+
+    kiTestStatus        = 0;
+    kiSchedGroups       = 1;
+    kiTestBoxes         = 2;
+
+    def __init__(self):
+        ModelFilterBase.__init__(self);
+        oCrit = FilterCriterion('Test status', sVarNm = 'ts', sType = FilterCriterion.ksType_String);
+        oCrit.aoPossible = (
+            FilterCriterionValueAndDescription(TestResultData.ksTestStatus_Success,  'Success'),
+            FilterCriterionValueAndDescription(TestResultData.ksTestStatus_Running,  'Running'),
+            FilterCriterionValueAndDescription(TestResultData.ksTestStatus_Skipped,  'Skipped'),
+            FilterCriterionValueAndDescription(TestResultData.ksTestStatus_Aborted,  'Aborted'),
+            FilterCriterionValueAndDescription(TestResultData.ksTestStatus_Failure,  'Failure'),
+            FilterCriterionValueAndDescription(TestResultData.ksTestStatus_TimedOut, 'Timed out'),
+            FilterCriterionValueAndDescription(TestResultData.ksTestStatus_Rebooted, 'Rebooted'),
+        );
+        self.aCriteria.append(oCrit);
+        assert self.aCriteria[self.kiTestStatus] is oCrit;
+
+        oCrit = FilterCriterion('Sched groups', sVarNm = 'sg');
+        self.aCriteria.append(oCrit);
+        assert self.aCriteria[self.kiSchedGroups] is oCrit;
+
+        oCrit = FilterCriterion('Testboxes', sVarNm = 'tb');
+        self.aCriteria.append(oCrit);
+        assert self.aCriteria[self.kiTestBoxes] is oCrit;
 
 
@@ -849 +883 @@
         return sRet
 
-    def fetchResultsForListing(self, iStart, cMaxRows, tsNow, sInterval, enmResultSortBy, # pylint: disable=R0913
+    def fetchResultsForListing(self, iStart, cMaxRows, tsNow, sInterval, oFilter, enmResultSortBy, # pylint: disable=R0913
                                enmResultsGroupingType, iResultsGroupingValue, fOnlyFailures, fOnlyNeedingReason):
         """
@@ -864 +898 @@
         Raises exception on error.
         """
+
+        _ = oFilter;
 
         #
@@ -939 +975 @@
             sQuery += '            AND TestSets.enmStatus != \'success\'::TestStatus_T\n' \
                       '            AND TestSets.enmStatus != \'running\'::TestStatus_T\n';
+        if oFilter.aCriteria[oFilter.kiTestStatus].sState == FilterCriterion.ksState_Selected:
+            sQuery += '            AND TestSets.enmStatus IN (' \
+                    + ', '.join('\'%s\'' % sValue for sValue in oFilter.aCriteria[oFilter.kiTestStatus].aoSelected) + ')\n';
+        if oFilter.aCriteria[oFilter.kiSchedGroups].sState == FilterCriterion.ksState_Selected:
+            sQuery += '            AND TestSets.idSchedGroup IN (' \
+                    + ', '.join(str(iVal) for iVal in oFilter.aCriteria[oFilter.kiSchedGroups].aoSelected) + ')\n';
+        if oFilter.aCriteria[oFilter.kiTestBoxes].sState == FilterCriterion.ksState_Selected:
+            sQuery += '            AND TestSets.idTestBox IN (' \
+                    + ', '.join(str(iVal) for iVal in oFilter.aCriteria[oFilter.kiTestBoxes].aoSelected) + ')\n';
         if fOnlyNeedingReason:
             sQuery += '            AND TestResultFailures.idTestSet IS NULL\n';
@@ -1070 +1115 @@
 
 
-    def getEntriesCount(self, tsNow, sInterval, enmResultsGroupingType, iResultsGroupingValue, fOnlyFailures, fOnlyNeedingReason):
+    def getEntriesCount(self, tsNow, sInterval, oFilter, enmResultsGroupingType, iResultsGroupingValue,
+                        fOnlyFailures, fOnlyNeedingReason):
         """
         Get number of table records.
@@ -1081 +1127 @@
         @param iResultsGroupingValue is ignored.
         """
+        _ = oFilter;
 
         #
@@ -1108 +1155 @@
             sQuery += '   AND TestSets.enmStatus != \'success\'::TestStatus_T\n' \
                       '   AND TestSets.enmStatus != \'running\'::TestStatus_T\n';
+        if oFilter.aCriteria[oFilter.kiTestStatus].sState == FilterCriterion.ksState_Selected:
+            sQuery += '            AND TestSets.enmStatus IN (' \
+                    + ', '.join('\'%s\'' % sValue for sValue in oFilter.aCriteria[oFilter.kiTestStatus].aoSelected) + ')\n';
+        if oFilter.aCriteria[oFilter.kiSchedGroups].sState == FilterCriterion.ksState_Selected:
+            sQuery += '            AND TestSets.idSchedGroup IN (' \
+                    + ', '.join(str(iVal) for iVal in oFilter.aCriteria[oFilter.kiSchedGroups].aoSelected) + ')\n';
+        if oFilter.aCriteria[oFilter.kiTestBoxes].sState == FilterCriterion.ksState_Selected:
+            sQuery += '            AND TestSets.idTestBox IN (' \
+                    + ', '.join(str(iVal) for iVal in oFilter.aCriteria[oFilter.kiTestBoxes].aoSelected) + ')\n';
         if fOnlyNeedingReason:
             sQuery += '   AND TestResultFailures.idTestSet IS NULL\n';
@@ -1298 +1354 @@
         except IndexError:
             return None
+
+
+    def fetchPossibleFilterOptions(self, oFilter, tsNow, sPeriod):
+        """
+        Fetches the available filter criteria.
+        Returns oFilter.
+        """
+        assert isinstance(oFilter, TestResultFilter);
+
+        # Scheduling groups (see getSchedGroups).
+        oCrit = oFilter.aCriteria[TestResultFilter.kiSchedGroups];
+        self._oDb.execute('SELECT SchedGroups.idSchedGroup, SchedGroups.sName\n'
+                          'FROM   ( SELECT idSchedGroup,\n'
+                          '                MAX(TestSets.tsCreated) AS tsNow\n'
+                          '         FROM   TestSets\n'
+                          '         WHERE  ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '         ') +
+                          '         GROUP BY idSchedGroup\n'
+                          '       ) AS SchedGroupIDs\n'
+                          '       INNER JOIN SchedGroups\n'
+                          '               ON SchedGroups.idSchedGroup = SchedGroupIDs.idSchedGroup\n'
+                          '              AND SchedGroups.tsExpire     > SchedGroupIDs.tsNow\n'
+                          '              AND SchedGroups.tsEffective <= SchedGroupIDs.tsNow\n'
+                          'ORDER BY SchedGroups.sName\n' );
+        for aoRow in self._oDb.fetchAll():
+            oCrit.aoPossible.append(FilterCriterionValueAndDescription(aoRow[0], aoRow[1]));
+
+        # Scheduling groups (see getTestBoxes).
+        oCrit = oFilter.aCriteria[TestResultFilter.kiTestBoxes];
+        self._oDb.execute('SELECT TestBoxesWithStrings.idTestBox, TestBoxesWithStrings.sName\n'
+                          'FROM   ( SELECT idTestBox         AS idTestBox,\n'
+                          '                MAX(idGenTestBox) AS idGenTestBox\n'
+                          '         FROM   TestSets\n'
+                          '         WHERE  ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '        ') +
+                          '         GROUP BY idTestBox\n'
+                          '       ) AS TestBoxIDs\n'
+                          '       LEFT OUTER JOIN TestBoxesWithStrings\n'
+                          '                    ON TestBoxesWithStrings.idGenTestBox = TestBoxIDs.idGenTestBox\n'
+                          'ORDER BY TestBoxesWithStrings.sName\n' );
+        for aoRow in self._oDb.fetchAll():
+            oCrit.aoPossible.append(FilterCriterionValueAndDescription(aoRow[0], aoRow[1]));
+
+        return oFilter;