Changeset 56806 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jul 5, 2015 4:58:12 PM (10 years ago)

Author:

vboxsync

Message:

testmanager/webui: Shorter interval formatting (like for test elapsed time).

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuicontentbase.py (modified) (2 diffs)
• wuimain.py (modified) (1 diff)
• wuitestresult.py (modified) (3 diffs)

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

@@ -213 +213 @@
         sTs = oTsZulu.strftime('%Y-%m-%d %H:%M:%SZ');
         return unicode(sTs).replace('-', u'\u2011').replace(' ', u'\u00a0');
+
+    def formatIntervalShort(self, oInterval):
+        """
+        Formats an interval (db rep) into a short form.
+        """
+        # default formatting for negative intervals.
+        if oInterval.days < 0:
+            return str(oInterval);
+
+        # Figure the hour, min and sec counts.
+        cHours   = oInterval.seconds / 3600;
+        cMinutes = (oInterval.seconds % 3600) / 60;
+        cSeconds = oInterval.seconds - cHours * 3600 - cMinutes * 60;
+
+        # Tailor formatting to the interval length.
+        if oInterval.days > 0:
+            if oInterval.days > 1:
+                return '%d days, %d:%02d:%02d' % (oInterval.days, cHours, cMinutes, cSeconds);
+            return '1 day, %d:%02d:%02d' % (cHours, cMinutes, cSeconds);
+        if cMinutes > 0 or cSeconds >= 30 or cHours > 0:
+            return '%d:%02d:%02d' % (cHours, cMinutes, cSeconds);
+        if cSeconds >= 10:
+            return '%d.%ds'   % (cSeconds, oInterval.microseconds / 100000);
+        if cSeconds > 0:
+            return '%d.%02ds' % (cSeconds, oInterval.microseconds / 10000);
+        return '%d ms' % (oInterval.microseconds / 1000,);
 
     @staticmethod
@@ -623 +649 @@
             elif db.isDbTimestamp(aoValues[i]):
                 sRow += webutils.escapeElem(self.formatTsShort(aoValues[i]));
+            elif db.isDbInterval(aoValues[i]):
+                sRow += webutils.escapeElem(self.formatIntervalShort(aoValues[i]));
             elif aoValues[i] is not None:
+                sRow += '<!-- type: %s -->' % (type(aoValues[i]),); ### XXXX
                 sRow += webutils.escapeElem(unicode(aoValues[i]));
 

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

@@ -793 +793 @@
         oBuildDataEx          = BuildDataEx().initFromDbWithId(self._oDb, oTestSetData.idBuild, oTestSetData.tsCreated);
         try:    oBuildValidationKitDataEx = BuildDataEx().initFromDbWithId(self._oDb, oTestSetData.idBuildTestSuite,
-                                                                       oTestSetData.tsCreated);
+                                                                           oTestSetData.tsCreated);
         except: oBuildValidationKitDataEx = None;
         oTestBoxData          = TestBoxData().initFromDbWithGenId(self._oDb, oTestSetData.idGenTestBox);

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

@@ -62 +62 @@
         if db.isDbTimestamp(oObject):
             return webutils.escapeElem(self.formatTsShort(oObject));
+        if db.isDbInterval(oObject):
+            return webutils.escapeElem(self.formatIntervalShort(oObject));
         if utils.isString(oObject):
             return webutils.escapeElem(oObject);
@@ -164 +166 @@
                        webutils.escapeElem(self.formatTsShort(tsEvent)),
                        sElapsedGraph,
-                       webutils.escapeElem(str(oTestResult.tsElapsed)) if oTestResult.tsElapsed is not None else '',
+                       webutils.escapeElem(self.formatIntervalShort(oTestResult.tsElapsed)) if oTestResult.tsElapsed is not None
+                                           else '',
                        sDisplayName,
                        ' id="failure-%u"' % (iFailure,) if oTestResult.isFailure() else '',
@@ -286 +289 @@
                            webutils.escapeElem(self.formatTsShort(oTestResult.tsCreated + oTestResult.tsElapsed)),
                            sElapsedGraph,
-                           webutils.escapeElem(str(oTestResult.tsElapsed)),
+                           webutils.escapeElem(self.formatIntervalShort(oTestResult.tsElapsed)),
                            sDisplayName,
                            ' id="failure-%u"' % (iFailure,) if oTestResult.isFailure() else '',