Changeset 61453 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui

Timestamp:

Jun 3, 2016 4:40:06 PM (9 years ago)

Author:

vboxsync

Message:

Fetch and show all failures reasons for a test in the main listing. The SQL is getting uglier and uglier...

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuitestresult.py (modified) (2 diffs)

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

@@ -838 +838 @@
 
         # Reason:
-        oReason = None;
-        #assert (oEntry.oFailureReason is None) == (oEntry.tsFailureReasonAssigned is None);
-        if oEntry.oFailureReason is not None:
-            sReasonTitle  = 'Reason:  \t%s\n' % ( oEntry.oFailureReason.sShort, );
-            sReasonTitle += 'Category:\t%s\n' % ( oEntry.oFailureReason.oCategory.sShort, );
-            sReasonTitle += 'Assigned:\t%s\n' % ( self.formatTsShort(oEntry.tsFailureReasonAssigned), );
-            sReasonTitle += 'By User: \t%s\n' % ( oEntry.oFailureReasonAssigner.sUsername, );
-            if oEntry.sFailureReasonComment is not None and len(oEntry.sFailureReasonComment) > 0:
-                sReasonTitle += 'Comment: \t%s\n' % ( oEntry.sFailureReasonComment, );
-            if oEntry.oFailureReason.iTicket is not None and oEntry.oFailureReason.iTicket > 0:
-                sReasonTitle += 'xTracker:\t#%s\n' % ( oEntry.oFailureReason.iTicket, );
-            for i, sUrl in enumerate(oEntry.oFailureReason.asUrls):
+        aoReasons = [];
+        for oIt in oEntry.aoFailureReasons:
+            sReasonTitle  = 'Reason:  \t%s\n' % ( oIt.oFailureReason.sShort, );
+            sReasonTitle += 'Category:\t%s\n' % ( oIt.oFailureReason.oCategory.sShort, );
+            sReasonTitle += 'Assigned:\t%s\n' % ( self.formatTsShort(oIt.tsFailureReasonAssigned), );
+            sReasonTitle += 'By User: \t%s\n' % ( oIt.oFailureReasonAssigner.sUsername, );
+            if oIt.sFailureReasonComment is not None and len(oIt.sFailureReasonComment) > 0:
+                sReasonTitle += 'Comment: \t%s\n' % ( oIt.sFailureReasonComment, );
+            if oIt.oFailureReason.iTicket is not None and oIt.oFailureReason.iTicket > 0:
+                sReasonTitle += 'xTracker:\t#%s\n' % ( oIt.oFailureReason.iTicket, );
+            for i, sUrl in enumerate(oIt.oFailureReason.asUrls):
                 sUrl = sUrl.strip();
                 if len(sUrl) > 0:
                     sReasonTitle += 'URL#%u:  \t%s\n' % ( i, sUrl, );
-            oReason = WuiTmLink(oEntry.oFailureReason.sShort, WuiAdmin.ksScriptName,
-                                { WuiAdmin.ksParamAction: WuiAdmin.ksActionFailureReasonDetails,
-                                  FailureReasonData.ksParam_idFailureReason: oEntry.oFailureReason.idFailureReason },
-                                sTitle = sReasonTitle);
+            aoReasons.append(WuiTmLink(oIt.oFailureReason.sShort, WuiAdmin.ksScriptName,
+                                       { WuiAdmin.ksParamAction: WuiAdmin.ksActionFailureReasonDetails,
+                                         FailureReasonData.ksParam_idFailureReason: oIt.oFailureReason.idFailureReason },
+                                       sTitle = sReasonTitle));
 
         return [
@@ -886 +885 @@
             oEntry.tsElapsed,
             aoTestSetLinks,
-            oReason
+            aoReasons
         ];