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

Timestamp:

Jan 31, 2020 11:13:38 AM (5 years ago)

Author:

vboxsync

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

135938

Message:

TestManager: Added revision range filtering.

Location:

trunk/src/VBox/ValidationKit/testmanager/core

Files:

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

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

@@ -1191 +1191 @@
     ksType_UIntNil = 'uint-nil'; ##< unsigned integer value, with nil.
     ksType_String  = 'string';   ##< string value.
+    ksType_Ranges  = 'ranges';   ##< List of (unsigned) integer ranges.
     ## @}
 
@@ -1243 +1244 @@
         self.aCriteria = [] # type: list[FilterCriterion]
 
-    def _initFromParamsWorker(self, oDisp, oCriterion):
+    def _initFromParamsWorker(self, oDisp, oCriterion): # (,FilterCriterion)
         """ Worker for initFromParams. """
         if oCriterion.sType == FilterCriterion.ksType_UInt:
@@ -1259 +1260 @@
                   or sValue[-1] == '\\':
                     raise TMExceptionBase('Variable %s has an illegal value "%s"!' % (oCriterion.sVarNm, sValue));
+        elif oCriterion.sType == FilterCriterion.ksType_Ranges:
+            def convertRangeNumber(sValue):
+                """ Helper """
+                sValue = sValue.strip();
+                if sValue and sValue not in ('inf', 'Inf', 'INf', 'INF', 'InF', 'iNf', 'iNF', 'inF',):
+                    try:    return int(sValue);
+                    except: pass;
+                return None;
+
+            for sRange in oDisp.getStringParam(oCriterion.sVarNm, sDefault = '').split(','):
+                sRange = sRange.strip();
+                if sRange and sRange != '-' and any(ch.isdigit() for ch in sRange):
+                    asValues = sRange.split('-');
+                    if len(asValues) == 1:
+                        asValues = [asValues[0], asValues[0]];
+                    elif len(asValues) > 2:
+                        asValues = [asValues[0], asValues[-1]];
+                    tTuple = (convertRangeNumber(asValues[0]), convertRangeNumber(asValues[1]));
+                    if tTuple[0] is not None and tTuple[1] is not None and tTuple[0] > tTuple[1]:
+                        tTuple = (tTuple[1], tTuple[0]);
+                    oCriterion.aoSelected.append(tTuple);
         else:
             assert False;

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

@@ -703 +703 @@
     kiBuildTypes            =  3;
     kiRevisions             =  4;
-    kiFailReasons           =  5;
-    kiTestCases             =  6;
-    kiTestCaseMisc          =  7;
-    kiTestBoxes             =  8
-    kiOses                  =  9;
-    kiCpuArches             = 10;
-    kiCpuVendors            = 11;
-    kiCpuCounts             = 12;
-    kiMemory                = 13;
-    kiTestboxMisc           = 14;
-    kiPythonVersions        = 15;
-    kiSchedGroups           = 16;
+    kiRevisionRange         =  5;
+    kiFailReasons           =  6;
+    kiTestCases             =  7;
+    kiTestCaseMisc          =  8;
+    kiTestBoxes             =  9;
+    kiOses                  = 10;
+    kiCpuArches             = 11;
+    kiCpuVendors            = 12;
+    kiCpuCounts             = 13;
+    kiMemory                = 14;
+    kiTestboxMisc           = 15;
+    kiPythonVersions        = 16;
+    kiSchedGroups           = 17;
 
     ## Misc test case / variation name filters.
@@ -783 +784 @@
         assert self.aCriteria[self.kiRevisions] is oCrit;
 
+        # Revision Range
+        oCrit = FilterCriterion('Revision Range', sVarNm = 'rr', sType = FilterCriterion.ksType_Ranges,
+                                sKind = FilterCriterion.ksKind_ElementOfOrNot, sTable = 'Builds', sColumn = 'iRevision');
+        self.aCriteria.append(oCrit);
+        assert self.aCriteria[self.kiRevisionRange] is oCrit;
+
         # Failure reasons
         oCrit = FilterCriterion('Failure reasons', sVarNm = 'fr', sType = FilterCriterion.ksType_UIntNil,
@@ -907 +914 @@
                     if iValue in dConditions:
                         sQuery += '%s   AND %s\n' % (sExtraIndent, dConditions[iValue],);
+            elif oCrit.sType == FilterCriterion.ksType_Ranges:
+                assert len(oCrit.aoPossible) == 0;
+                if oCrit.aoSelected:
+                    asConditions = [];
+                    for tRange in oCrit.aoSelected:
+                        if tRange[0] == tRange[1]:
+                            asConditions.append('%s.%s = %s' % (oCrit.asTables[0], oCrit.sColumn, tRange[0]));
+                        elif tRange[1] is None: # 9999-
+                            asConditions.append('%s.%s >= %s' % (oCrit.asTables[0], oCrit.sColumn, tRange[0]));
+                        elif tRange[0] is None: # -9999
+                            asConditions.append('%s.%s <= %s' % (oCrit.asTables[0], oCrit.sColumn, tRange[1]));
+                        else:
+                            asConditions.append('%s.%s BETWEEN %s AND %s' % (oCrit.asTables[0], oCrit.sColumn,
+                                                                             tRange[0], tRange[1]));
+                    if not oCrit.fInverted:
+                        sQuery += '%s   AND (%s)\n' % (sExtraIndent, ' OR '.join(asConditions));
+                    else:
+                        sQuery += '%s   AND NOT (%s)\n' % (sExtraIndent, ' OR '.join(asConditions));
             else:
                 assert len(oCrit.asTables) == 1;