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

Timestamp:

Jun 5, 2016 9:02:01 PM (9 years ago)

Author:

vboxsync

Message:

testmanager: Preparting TestSets for TestBoxes belonging to more than one scheduling group by storing the idSchedGroup in TestSets as well (this has a slight speed up effect on grouping results by scheduling group too of course). The idSchedGroup column in TestBoxes will be changed into a M:N table later some time. Also corrected a typo regarding orphaned tests.

Location:

trunk/src/VBox/ValidationKit/testmanager/core

Files:

• schedulerbase.py (modified) (4 diffs)
• systemlog.py (modified) (2 diffs)
• testboxcontroller.py (modified) (1 diff)
• testresults.py (modified) (2 diffs)
• testset.py (modified) (6 diffs)

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

@@ -884 +884 @@
                           '             idGenTestBox,\n'
                           '             idTestBox,\n'
+                          '             idSchedGroup,\n'
                           '             idTestGroup,\n'
                           '             idGenTestCase,\n'
@@ -900 +901 @@
                           '             %s,\n'      # idGenTestBox
                           '             %s,\n'      # idTestBox
+                          '             %s,\n'      # idSchedGroup
                           '             %s,\n'      # idTestGroup
                           '             %s,\n'      # idGenTestCase
@@ -916 +918 @@
                               oTestBoxData.idGenTestBox,
                               oTestBoxData.idTestBox,
+                              oTestBoxData.idSchedGroup,
                               oTask.idTestGroup,
                               oTestEx.oTestCase.idGenTestCase,
@@ -1044 +1047 @@
                 fDecision = oEntry.getPreReqDecision(sPreReqSet);
                 if fDecision is None:
-                    ## @todo DB Tuning
                     # Check for missing prereqs.
                     self._oDb.execute('SELECT   COUNT(*)\n'
                                       'FROM     (VALUES ' + sPreReqSet + ') AS PreReqs(idTestCase)\n'
-                                      'LEFT OUTER JOIN (SELECT  *\n'
+                                      'LEFT OUTER JOIN (SELECT  idTestSet\n'
                                       '                 FROM    TestSets\n'
                                       '                 WHERE   enmStatus IN (%s, %s)\n'

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

@@ -46 +46 @@
     ksEvent_CmdNacked           = 'CmdNack ';
     ksEvent_TestBoxUnknown      = 'TBoxUnkn';
-    ksEvent_TestSetAbandond     = 'TSetAbdd';
+    ksEvent_TestSetAbandoned    = 'TSetAbdd';
     ksEvent_UserAccountUnknown  = 'TAccUnkn';
     ksEvent_XmlResultMalformed  = 'XmlRMalf';
@@ -57 +57 @@
         ksEvent_CmdNacked,
         ksEvent_TestBoxUnknown,
-        ksEvent_TestSetAbandond,
+        ksEvent_TestSetAbandoned,
         ksEvent_UserAccountUnknown,
         ksEvent_XmlResultMalformed,

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

@@ -273 +273 @@
         Cleans up any old test set that may be left behind and changes the
         state to 'idle'.  See scenario #9:
-        file://../../docs/AutomaticTestingRevamp.html#cleaning-up-abandond-testcase
+        file://../../docs/AutomaticTestingRevamp.html#cleaning-up-abandoned-testcase
 
         Note. oStatusData.enmState is set to idle, but tsUpdated is not changed.
         """
 
-        # Cleanup any abandond test.
+        # Cleanup any abandoned test.
         if oStatusData.idTestSet is not None:
-            SystemLogLogic(oDb).addEntry(SystemLogData.ksEvent_TestSetAbandond,
+            SystemLogLogic(oDb).addEntry(SystemLogData.ksEvent_TestSetAbandoned,
                                          "idTestSet=%u idTestBox=%u enmState=%s %s"
                                          % (oStatusData.idTestSet, oStatusData.idTestBox,
                                             oStatusData.enmState, self._sAction),
                                          fCommit = False);
-            TestSetLogic(oDb).completeAsAbandond(oStatusData.idTestSet, fCommit = False);
+            TestSetLogic(oDb).completeAsAbandoned(oStatusData.idTestSet, fCommit = False);
             GlobalResourceLogic(oDb).freeGlobalResourcesByTestBox(self._idTestBox, fCommit = False);
 

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

@@ -799 +799 @@
             { ksResultsSortByBuildRevision: ( '', None,  ' Builds.iRevision DESC' ), }
         ),
-        ksResultsGroupingTypeSchedGroup: (
-            ', TestBoxesWithStrings',
-            'TestBoxesWithStrings.idSchedGroup',
-            ' AND TestSets.idGenTestBox = TestBoxesWithStrings.idGenTestBox',
-            {
-
-              ksResultsSortByTestBoxName: (
-                  # Sorting tables.
-                  '',
-                  # Sorting table join(s).
-                  None,
-                  # Start of ORDER BY statement.
-                  ' TestBoxesWithStrings.sName DESC',
-                  # Extra columns to fetch for the above ORDER BY to work in a SELECT DISTINCT statement.
-                  '',
-                  # Columns for the GROUP BY
-                  '' ),
-              ksResultsSortByTestBoxOsArch:     ( '', None, ' TestBoxesWithStrings.sOs, TestBoxesWithStrings.sCpuArch', '', '' ),
-              ksResultsSortByTestBoxOs:         ( '', None, ' TestBoxesWithStrings.sOs', '', ''  ),
-              ksResultsSortByTestBoxOsVersion:  ( '', None, ' TestBoxesWithStrings.sOs, TestBoxesWithStrings.sOsVersion DESC',
-                                                  '', '' ),
-              ksResultsSortByTestBoxArch:       ( '', None, ' TestBoxesWithStrings.sCpuArch', '', ''  ),
-              ksResultsSortByTestBoxCpuVendor:  ( '', None, ' TestBoxesWithStrings.sCpuVendor', '', ''  ),
-              ksResultsSortByTestBoxCpuName:    ( '', None, ' TestBoxesWithStrings.sCpuVendor, TestBoxesWithStrings.sCpuName',
-                                                  '', '' ),
-              ksResultsSortByTestBoxCpuRev: (
-                  '',
-                  None,
-                  ' TestBoxesWithStrings.sCpuVendor, TestBoxesWithStrings.lCpuRevision DESC',
-                  ', TestBoxesWithStrings.lCpuRevision',
-                  ', TestBoxesWithStrings.lCpuRevision' ),
-              ksResultsSortByTestBoxCpuFeatures: (
-                  '',
-                  None,
-                  ' TestBoxesWithStrings.fCpuHwVirt DESC, TestBoxesWithStrings.fCpuNestedPaging DESC, '
-                  +'TestBoxesWithStrings.fCpu64BitGuest DESC, TestBoxesWithStrings.cCpus DESC',
-                  '',
-                  '' ), }
-        ),
+        ksResultsGroupingTypeSchedGroup: ( '', 'TestSets.idSchedGroup',   None,                      {},),
     };
 
@@ -1228 +1190 @@
 
         self._oDb.execute('SELECT SchedGroups.*\n'
-                          'FROM   ( SELECT TestBoxes.idSchedGroup  AS idSchedGroup,\n'
+                          'FROM   ( SELECT idSchedGroup,\n'
                           '                MAX(TestSets.tsCreated) AS tsNow\n'
-                          '         FROM   TestSets,\n'
-                          '                TestBoxes\n'
-                          '         WHERE  TestSets.idGenTestBox = TestBoxes.idGenTestBox\n'
-                          '            AND ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '         ') +
+                          '         FROM   TestSets\n'
+                          '         WHERE  ' + self._getTimePeriodQueryPart(tsNow, sPeriod, '         ') +
                           '         GROUP BY idSchedGroup\n'
                           '       ) AS SchedGroupIDs\n'

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

@@ -79 +79 @@
     ksParam_idGenTestBox        = 'TestSet_idGenTestBox';
     ksParam_idTestBox           = 'TestSet_idTestBox';
+    ksParam_idSchedGroup        = 'TestSet_idSchedGroup';
     ksParam_idTestGroup         = 'TestSet_idTestGroup';
     ksParam_idGenTestCase       = 'TestSet_idGenTestCase';
@@ -89 +90 @@
     ksParam_idTestSetGangLeader = 'TestSet_idTestSetGangLeader';
 
-    kasAllowNullAttributes      = ['tsDone', 'idBuildTestSuite', 'idTestSetGangLeader' ];
+    kasAllowNullAttributes      = [ 'tsDone', 'idBuildTestSuite', 'idTestSetGangLeader' ];
     kasValidValues_enmStatus    = [
         ksTestStatus_Running,
@@ -104 +105 @@
 
 
+    kcDbColumns                 = 20;
+
     def __init__(self):
         ModelDataBase.__init__(self);
@@ -121 +124 @@
         self.idGenTestBox           = None;
         self.idTestBox              = None;
+        self.idSchedGroup           = None;
         self.idTestGroup            = None;
         self.idGenTestCase          = None;
@@ -150 +154 @@
         self.idGenTestBox           = aoRow[8];
         self.idTestBox              = aoRow[9];
-        self.idTestGroup            = aoRow[10];
-        self.idGenTestCase          = aoRow[11];
-        self.idTestCase             = aoRow[12];
-        self.idGenTestCaseArgs      = aoRow[13];
-        self.idTestCaseArgs         = aoRow[14];
-        self.idTestResult           = aoRow[15];
-        self.sBaseFilename          = aoRow[16];
-        self.iGangMemberNo          = aoRow[17];
-        self.idTestSetGangLeader    = aoRow[18];
+        self.idSchedGroup           = aoRow[10];
+        self.idTestGroup            = aoRow[11];
+        self.idGenTestCase          = aoRow[12];
+        self.idTestCase             = aoRow[13];
+        self.idGenTestCaseArgs      = aoRow[14];
+        self.idTestCaseArgs         = aoRow[15];
+        self.idTestResult           = aoRow[16];
+        self.sBaseFilename          = aoRow[17];
+        self.iGangMemberNo          = aoRow[18];
+        self.idTestSetGangLeader    = aoRow[19];
         return self;
 
@@ -443 +448 @@
         return oData.idTestSetGangLeader;
 
-    def completeAsAbandond(self, idTestSet, fCommit = False):
+    def completeAsAbandoned(self, idTestSet, fCommit = False):
         """
         Completes the testset as abandoned if necessary.