Changeset 53039 in vbox for trunk

Timestamp:

Oct 13, 2014 10:49:38 AM (10 years ago)

Author:

vboxsync

Message:

TestManager: temporary reverted r95734: unfinished 'guru' state highlighting.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (1 diff)
• testmanager/core/testresults.py (modified) (6 diffs)
• testmanager/webui/wuitestresult.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -2939 +2939 @@
                 elif oTask is oSession:
                     oSession.reportPrematureTermination('txsDoConnectViaTcp: ');
-                    # Attempt to post VM termination state.
-                    (enmState, sStateNm) = oSession.getMachineStateWithName()
-                    if enmState is not None:
-                        reporter.testFailure("%s" % sStateNm)
                 else:
                     reporter.error('txsDoConnectViaTcp: unknown/wrong task %s' % (oTask,));

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

@@ -453 +453 @@
         self.iRevisionTestSuite      = None;
 
-        self.asMsgs                  = None;
-
     def initFromDbRow(self, aoRow):
         """
@@ -499 +497 @@
         self.iRevisionTestSuite      = aoRow[29];
 
-        self.asMsgs                  = aoRow[31];
-
         return self
 
@@ -524 +520 @@
     ksResultsGroupingTypeSchedGroup = 'ResultsGroupingTypeSchedGroup'
 
-    ksBaseTables = 'BuildCategories, Builds, TestBoxes, TestCases, TestCaseArgs,\n' \
-                   '       TestSets LEFT OUTER JOIN Builds AS TestSuiteBits\n' \
-                   '                ON TestSets.idBuildTestSuite = TestSuiteBits.idBuild,\n' \
-                   'TestResults LEFT OUTER JOIN TestResults as MsgTab ON TestResults.idTestResult=MsgTab.idTestResultParent\n' \
-                   '  LEFT OUTER JOIN TestResultMsgs as MsgTab1 ON MsgTab.idTestResult = MsgTab1.idTestResult\n' \
-                   '    LEFT OUTER JOIN TestResultStrTab as MsgTab2 ON MsgTab1.idStrMsg = MsgTab2.idStr\n'
+    ksBaseTables = 'BuildCategories, Builds, TestBoxes, TestResults, TestCases, TestCaseArgs,\n' \
+                 + '       TestSets LEFT OUTER JOIN Builds AS TestSuiteBits\n' \
+                   '                ON TestSets.idBuildTestSuite = TestSuiteBits.idBuild\n';
 
     ksBasePreCondition = 'TestSets.idTestSet         = TestResults.idTestSet\n' \
@@ -559 +552 @@
                                           ksBasePreCondition + '   AND TestBoxes.idSchedGroup',),
     }
-
-    ksGroupByPreCondition = 'TestResults.idTestResult, TestSets.idTestSet, TestResults.cErrors,\n' \
-                            'TestCases.idTestCase, TestCases.sName, TestSuiteBits.idBuild, TestSuiteBits.iRevision,\n' \
-                            'BuildCategories.idBuildCategory, Builds.idBuild, Builds.sVersion, Builds.iRevision,\n' \
-                            'TestBoxes.sOs, TestBoxes.sOsVersion, TestBoxes.sCpuArch, TestBoxes.sCpuVendor,\n' \
-                            'TestBoxes.sCpuName, TestBoxes.cCpus, TestBoxes.fCpuHwVirt, TestBoxes.fCpuNestedPaging,\n' \
-                            'TestBoxes.fCpu64BitGuest, TestBoxes.idTestBox, TestBoxes.sName, TestCases.sBaseCmd,\n' \
-                            'TestCaseArgs.sArgs'
 
     def _getTimePeriodQueryPart(self, tsNow, sInterval):
@@ -621 +606 @@
         sQuery += 'FROM   %s\n'  % sTables
         sQuery += 'WHERE  %s\n' % sCondition
-        sQuery += 'GROUP BY %s\n' % self.ksGroupByPreCondition
 
         return sQuery
@@ -671 +655 @@
                 '       TestSuiteBits.idBuild AS idBuildTestSuite,\n' \
                 '       TestSuiteBits.iRevision AS iRevisionTestSuite,\n' \
-                '       (TestSets.tsDone IS NULL) SortRunningFirst,' \
-                '       array_agg(MsgTab2.sValue) AS asMsgs' \
+                '       (TestSets.tsDone IS NULL) SortRunningFirst' \
                 ;
 

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

@@ -654 +654 @@
 
 
-        if all(str(sMsg).lower().find('guru') == -1 for sMsg in oEntry.asMsgs) is True:
-            sStatus = oEntry.enmStatus
-        else:
-            sStatus = 'guru'
-
-        aoTestSetLinks = [ WuiTmLink(sStatus,
+        aoTestSetLinks = [ WuiTmLink(oEntry.enmStatus,
                                      WuiMain.ksScriptName,
                                      { WuiMain.ksParamAction: WuiMain.ksActionTestResultDetails,