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

Timestamp:

May 30, 2016 3:25:41 PM (9 years ago)

Author:

vboxsync

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

107595

Message:

wuireport.py: shorter, better.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/testbox.py (modified) (1 diff)
• webui/wuireport.py (modified) (1 diff)

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

@@ -269 +269 @@
             return 0;
         return (self.lCpuRevision & 0xff);
+
+    def getArchBitString(self):
+        """ Returns 32-bit, 64-bit, <none>, or sCpuArch. """
+        if self.sCpuArch is None:
+            return '<none>';
+        if self.sCpuArch in [ 'x86',]:
+            return '32-bit';
+        if self.sCpuArch in [ 'amd64',]:
+            return '64-bit';
+        return self.sCpuArch;
+
+    def getPrettyCpuVendor(self):
+        """ Returns the CPU model for a x86 or amd64 testboxes."""
+        if self.sCpuVendor is None:
+            return '<none>';
+        if self.sCpuVendor == 'GenuineIntel':     return 'Intel';
+        if self.sCpuVendor == 'AuthenticAMD':     return 'AMD';
+        if self.sCpuVendor == 'CentaurHauls':     return 'VIA';
+        return self.sCpuVendor;
+
 
 

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

@@ -589 +589 @@
             sHtml += u'<td>%s</td>' % (webutils.escapeElem(sOsAndVer),);
         else: # wonder if td.title works..
-            sHtml += u'<td title="%s" width="1%%" style="white-space:nowrap;">%s...</td>' % (webutils.escapeAttr(sOsAndVer), webutils.escapeElem(sOsAndVer[:20]));
-        sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.sCpuArch),);
-        sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.sCpuVendor),);
+            sHtml += u'<td title="%s" width="1%%" style="white-space:nowrap;">%s...</td>' \
+                  % (webutils.escapeAttr(sOsAndVer), webutils.escapeElem(sOsAndVer[:20]));
+        sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getCpuBitString()),);
+        sHtml += u'<td>%s</td>'    % (webutils.escapeElem(oTestBox.getPrettyCpuVendor()),);
         sHtml += u'<td>f=%#x, m=%#x, s=%#x' % (oTestBox.getCpuFamily(), oTestBox.getCpuModel(), oTestBox.getCpuStepping(),)
         if oTestBox.fCpuNestedPaging:   sHtml += u', np';