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

Timestamp:

Dec 18, 2016 2:50:33 PM (8 years ago)

Author:

vboxsync

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

112364

Message:

testmanager: new result groupings; tab order hack.

File:

• trunk/src/VBox/ValidationKit/testmanager/core/testresults.py (modified) (4 diffs)

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

@@ -40 +40 @@
                                                    TMTooManyRows, TMRowNotFound;
 from testmanager.core.testgroup             import TestGroupData;
-from testmanager.core.build                 import BuildDataEx;
+from testmanager.core.build                 import BuildDataEx, BuildCategoryData;
 from testmanager.core.failurereason         import FailureReasonLogic;
 from testmanager.core.testbox               import TestBoxData;
@@ -651 +651 @@
     ksResultsGroupingTypeNone       = 'ResultsGroupingTypeNone';
     ksResultsGroupingTypeTestGroup  = 'ResultsGroupingTypeTestGroup';
-    ksResultsGroupingTypeBuildRev   = 'ResultsGroupingTypeBuild';
+    ksResultsGroupingTypeBuildCat   = 'ResultsGroupingTypeBuildCat';
+    ksResultsGroupingTypeBuildRev   = 'ResultsGroupingTypeBuildRev';
     ksResultsGroupingTypeTestBox    = 'ResultsGroupingTypeTestBox';
     ksResultsGroupingTypeTestCase   = 'ResultsGroupingTypeTestCase';
+    ksResultsGroupingTypeOS         = 'ResultsGroupingTypeOS';
+    ksResultsGroupingTypeArch       = 'ResultsGroupingTypeArch';
     ksResultsGroupingTypeSchedGroup = 'ResultsGroupingTypeSchedGroup';
 
@@ -793 +796 @@
         ksResultsGroupingTypeTestBox:    ('', 'TestSets.idTestBox',       None,                      {},),
         ksResultsGroupingTypeTestCase:   ('', 'TestSets.idTestCase',      None,                      {},),
+        ksResultsGroupingTypeOS:                (
+            ', TestBoxes',
+            'TestBoxes.idStrOs',
+            ' AND TestBoxes.idGenTestBox = TestSets.idGenTestBox',
+            {},
+        ),
+        ksResultsGroupingTypeArch:       (
+            ', TestBoxes',
+            'TestBoxes.idStrCpuArch',
+            ' AND TestBoxes.idGenTestBox = TestSets.idGenTestBox',
+            {},
+        ),
+        ksResultsGroupingTypeBuildCat:   ('', 'TestSets.idBuildCategory', None,                      {},),
         ksResultsGroupingTypeBuildRev: (
             ', Builds',
@@ -1186 +1202 @@
         return aoRet
 
+    def getOSes(self, tsNow, sPeriod):
+        """
+        Get a list of [idStrOs, sOs] tuples of the OSes that appears in the specified result period.
+        """
+
+        # Note! INNER JOIN TestBoxesWithStrings performs miserable compared to LEFT OUTER JOIN. Doesn't matter for the result
+        #       because TestSets.idGenTestBox is a foreign key and unique in TestBoxes.  So, let's do what ever is faster.
+        self._oDb.execute('SELECT DISTINCT TestBoxesWithStrings.idStrOs, TestBoxesWithStrings.sOs\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.sOs\n' );
+        return self._oDb.fetchAll();
+
+    def getArchitectures(self, tsNow, sPeriod):
+        """
+        Get a list of [idStrCpuArch, sCpuArch] tuples of the architecutres
+        that appears in the specified result period.
+        """
+
+        # Note! INNER JOIN TestBoxesWithStrings performs miserable compared to LEFT OUTER JOIN. Doesn't matter for the result
+        #       because TestSets.idGenTestBox is a foreign key and unique in TestBoxes.  So, let's do what ever is faster.
+        self._oDb.execute('SELECT DISTINCT TestBoxesWithStrings.idStrCpuArch, TestBoxesWithStrings.sCpuArch\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.sCpuArch\n' );
+        return self._oDb.fetchAll();
+
+    def getBuildCategories(self, tsNow, sPeriod):
+        """
+        Get a list of BuildCategoryData that appears in the specified result period.
+        """
+
+        self._oDb.execute('SELECT DISTINCT BuildCategories.*\n'
+                          'FROM   ( SELECT DISTINCT idBuildCategory AS idBuildCategory\n'
+                          '         FROM   TestSets\n'
+                          '         WHERE  ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '        ') +
+                          '       ) AS BuildCategoryIDs\n'
+                          '       LEFT OUTER JOIN BuildCategories\n'
+                          '                    ON BuildCategories.idBuildCategory = BuildCategoryIDs.idBuildCategory\n'
+                          'ORDER BY BuildCategories.sProduct, BuildCategories.sBranch, BuildCategories.sType\n');
+        aoRet = [];
+        for aoRow in self._oDb.fetchAll():
+            aoRet.append(BuildCategoryData().initFromDbRow(aoRow));
+        return aoRet;
+
     def getSchedGroups(self, tsNow, sPeriod):
         """