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

Timestamp:

Oct 23, 2014 9:15:34 PM (10 years ago)

Author:

vboxsync

Message:

Validation Kit: show both the darwin version and the OSX version

Location:

trunk/src/VBox/ValidationKit

Files:

• common/utils.py (modified) (2 diffs)
• testmanager/webui/wuiadmintestbox.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/common/utils.py

@@ -203 +203 @@
 
     elif sOs == 'darwin':
-        sVersion = platform.mac_ver()[0];
+        sOsxVersion = platform.mac_ver()[0];
         codenames = {"4": "Tiger",
                      "5": "Leopard",
@@ -211 +211 @@
                      "9": "Mavericks",
                      "10": "Yosemite"}
-        sVersion += ' (' + codenames[sVersion.split('.')[1]] + ')'
+        sVersion += ' / OS X ' + sOsxVersion + ' (' + codenames[sOsxVersion.split('.')[1]] + ')'
 
     return sVersion;

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

@@ -242 +242 @@
             sVer1 = sOsVersion;
             sVer2 = None;
-            if oEntry.sOs == 'linux':
+            if oEntry.sOs == 'linux' or oEntry.sOs == 'darwin':
                 iSep = sOsVersion.find(' / ');
                 if iSep > 0: