Changeset 70521 in vbox for trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

Timestamp:

Jan 10, 2018 3:49:10 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: More python 3 adjustments.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -32 +32 @@
 
 # Standard Python imports.
-import os
-import socket
+import os;
+import socket;
+import sys;
 
 # Validation Kit imports.
@@ -480 +481 @@
                 if fErrorOnTimeout:
                     if fIgnoreErrors:
-                        reporter.log('Timing out after waiting for %u s on "%s" operation %d' \
+                        reporter.log('Timing out after waiting for %s s on "%s" operation %d' \
                                      % (cMsTimeout / 1000, self.sName, iOperation))
                     else:
-                        reporter.error('Timing out after waiting for %u s on "%s" operation %d' \
+                        reporter.error('Timing out after waiting for %s s on "%s" operation %d' \
                                        % (cMsTimeout / 1000, self.sName, iOperation))
                 return -1;
@@ -1544 +1545 @@
                 sHostIP = socket.gethostbyname(sHostName)
                 abHostIP = socket.inet_aton(sHostIP)
-                if   ord(abHostIP[0]) == 127 \
-                  or (ord(abHostIP[0]) == 169 and ord(abHostIP[1]) == 254) \
-                  or (ord(abHostIP[0]) == 192 and ord(abHostIP[1]) == 168 and ord(abHostIP[2]) == 56):
+                if sys.version_info[0] < 3:
+                    abHostIP = (ord(abHostIP[0]), ord(abHostIP[1]), ord(abHostIP[2]), ord(abHostIP[3]));
+                if   abHostIP[0] == 127 \
+                  or (abHostIP[0] == 169 and abHostIP[1] == 254) \
+                  or (abHostIP[0] == 192 and abHostIP[1] == 168 and abHostIP[2] == 56):
                     reporter.log('warning: host IP for "%s" is %s, most likely not unique.' % (sHostName, sHostIP))
             except:
@@ -1552 +1555 @@
                 return False
             sDefaultMac = '%02X%02X%02X%02X%02X%02X' \
-                % (0x02, ord(abHostIP[0]), ord(abHostIP[1]), ord(abHostIP[2]), ord(abHostIP[3]), iNic)
+                % (0x02, abHostIP[0], abHostIP[1], abHostIP[2], abHostIP[3], iNic)
             sMacAddr = sDefaultMac[0:(12 - cchMacAddr)] + sMacAddr
 
@@ -2833 +2836 @@
 
         oTxsSession = txsclient.tryOpenTcpSession(cMsTimeout, sHostname, fReversedSetup = fReversed,
-                                                  cMsIdleFudge = cMsTimeout / 2);
+                                                  cMsIdleFudge = cMsTimeout // 2);
         if oTxsSession is None:
             return False;