Changeset 61258 in vbox for trunk/src

Timestamp:

May 28, 2016 5:02:26 AM (9 years ago)

Author:

vboxsync

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

107550

Message:

display TestCaseArgs.sSubName

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/testresults.py (modified) (3 diffs)
• webui/wuitestresult.py (modified) (2 diffs)

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

@@ -561 +561 @@
         self.sBaseCmd                = None
         self.sArgs                   = None
+        self.sSubName                = None;
 
         self.idBuildTestSuite        = None;
@@ -610 +611 @@
         self.sBaseCmd                = aoRow[26];
         self.sArgs                   = aoRow[27];
-
-        self.idBuildTestSuite        = aoRow[28];
-        self.iRevisionTestSuite      = aoRow[29];
+        self.sSubName                = aoRow[28];
+
+        self.idBuildTestSuite        = aoRow[29];
+        self.iRevisionTestSuite      = aoRow[30];
 
         self.oFailureReason          = None;
-        if aoRow[30] is not None:
+        if aoRow[31] is not None:
             self.oFailureReason = oFailureReasonLogic.cachedLookup(aoRow[30]);
         self.oFailureReasonAssigner  = None;
-        if aoRow[31] is not None:
+        if aoRow[32] is not None:
             self.oFailureReasonAssigner = oUserAccountLogic.cachedLookup(aoRow[31]);
-        self.tsFailureReasonAssigned = aoRow[32];
-        self.sFailureReasonComment   = aoRow[33];
+        self.tsFailureReasonAssigned = aoRow[33];
+        self.sFailureReasonComment   = aoRow[34];
 
         return self
@@ -889 +891 @@
                   '       TestCases.sBaseCmd,\n' \
                   '       TestCaseArgs.sArgs,\n' \
+                  '       TestCaseArgs.sSubName,\n' \
                   '       TestSuiteBits.idBuild AS idBuildTestSuite,\n' \
                   '       TestSuiteBits.iRevision AS iRevisionTestSuite,\n' \

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

@@ -801 +801 @@
         sTestBoxTitle += u'CPU features:\t' + u', '.join(asFeatures);
 
+        # Testcase
+        if oEntry.sSubName is not None and len(oEntry.sSubName) > 0:
+            sTestCaseName = '%s / %s' % (oEntry.sTestCaseName, oEntry.sSubName,);
+        else:
+            sTestCaseName = oEntry.sTestCaseName;
+
         # Reason:
         oReason = None;
@@ -839 +845 @@
                         fBracketed = False) ],
             '%s.%s' % (oEntry.sOs, oEntry.sArch),
-            [ WuiTmLink(oEntry.sTestCaseName, WuiMain.ksScriptName, self._dTestCaseLinkParams, fBracketed = False,
+            [ WuiTmLink(sTestCaseName, WuiMain.ksScriptName, self._dTestCaseLinkParams, fBracketed = False,
                         sTitle = (oEntry.sBaseCmd + ' ' + oEntry.sArgs) if oEntry.sArgs else oEntry.sBaseCmd),
               WuiTmLink(self.ksShortDetailsLink, WuiAdmin.ksScriptName,