Changeset 70611 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

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

Author:

vboxsync

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

120333

Message:

testdriver: More python 3 adjustments.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• reporter.py (modified) (2 diffs)
• tst-txsclient.py (modified) (2 diffs)
• txsclient.py (modified) (9 diffs)
• vbox.py (modified) (1 diff)

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

@@ -506 +506 @@
 
             # output it.
-            sAscii = sLogText.encode('ascii', 'replace');
+            if sys.version_info[0] >= 3:
+                sAscii = sLogText;
+            else:
+                sAscii = sLogText.encode('ascii', 'replace');
             if self.iDebug == 0:
                 print('%s: %s' % (self.sName, sAscii), file = self.oStdErr);
@@ -1204 +1207 @@
             self.fStarted = True;
 
-        if isinstance(sText, array.array):
-            try:
-                sText = sText.tostring();
-            except:
-                pass;
+        # Turn non-string stuff into strings.
+        if not utils.isString(sText):
+            if isinstance(sText, array.array):
+                try:    sText = sText.tostring();
+                except: pass;
+            if not utils.isString(sText) and hasattr(sText, 'decode'):
+                try:    sText = sText.decode('utf-8', 'ignore');
+                except: pass;
+
         try:
             g_oReporter.subXmlWrite(self, sText, utils.getCallerName());

trunk/src/VBox/ValidationKit/testdriver/tst-txsclient.py

@@ -34 +34 @@
 import os
 import sys
-import types
 
 # Validation Kit imports.
@@ -54 +53 @@
     global g_cTests, g_cFailures;
     g_cTests = g_cTests + 1;
-    if isinstance(rc, types.BooleanType):
+    if isinstance(rc, bool):
         if rc == fExpect:
             return 'PASSED';

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

@@ -38 +38 @@
 import threading;
 import time;
-import types;
 import zlib;
 import uuid;
@@ -366 +365 @@
                             abPayload.append(ord(sUtf8[i]))
                     abPayload.append(0);
-                elif isinstance(o, types.LongType):
+                elif isinstance(o, long):
                     if o < 0 or o > 0xffffffff:
                         reporter.fatal('sendMsg: uint32_t payload is out of range: %s' % (hex(o)));
@@ -736 +735 @@
             elif o is not None:
                 aoPayload.append('|');
-                o.uTxsClientCrc32 = zlib.crc32('');
+                o.uTxsClientCrc32 = zlib.crc32(b'');
             else:
                 aoPayload.append('');
@@ -1081 +1080 @@
             # Push data packets until eof.
             #
-            uMyCrc32 = zlib.crc32("");
+            uMyCrc32 = zlib.crc32(b'');
             while True:
                 # Read up to 64 KB of data.
@@ -1147 +1146 @@
         return rc;
 
-    def taskDownloadString(self, sRemoteFile):
+    def taskDownloadString(self, sRemoteFile, sEncoding = 'utf-8', fIgnoreEncodingErrors = True):
         # Wrap sContent in a file like class.
         class OutStringFile(object): # pylint: disable=R0903
@@ -1160 +1159 @@
         rc = self.taskDownloadCommon(sRemoteFile, oLocalString);
         if rc is True:
-            if not oLocalString.asContent:
-                rc = '';
-            else:
-                rc = ''.join(oLocalString.asContent);
+            rc = '';
+            for sBuf in oLocalString.asContent:
+                if hasattr(sBuf, 'decode'):
+                    rc += sBuf.decode(sEncoding, 'ignore' if fIgnoreEncodingErrors else 'strict');
+                else:
+                    rc += sBuf;
         return rc;
 
@@ -1173 +1174 @@
             # Process data packets until eof.
             #
-            uMyCrc32 = zlib.crc32("");
+            uMyCrc32 = zlib.crc32(b'');
             while rc is True:
                 cbMsg, sOpcode, abPayload = self.recvReply();
@@ -1610 +1611 @@
         return self.asyncToSync(self.asyncDownloadFile, sRemoteFile, sLocalFile, cMsTimeout, fIgnoreErrors);
 
-    def asyncDownloadString(self, sRemoteFile, cMsTimeout = 30000, fIgnoreErrors = False):
+    def asyncDownloadString(self, sRemoteFile, sEncoding = 'utf-8', fIgnoreEncodingErrors = True,
+                            cMsTimeout = 30000, fIgnoreErrors = False):
         """
         Initiates a download string task.
@@ -1618 +1620 @@
         The task returns a byte string on success, False on failure (logged).
         """
-        return self.startTask(cMsTimeout, fIgnoreErrors, "downloadString", self.taskDownloadString, (sRemoteFile,));
-
-    def syncDownloadString(self, sRemoteFile, cMsTimeout = 30000, fIgnoreErrors = False):
+        return self.startTask(cMsTimeout, fIgnoreErrors, "downloadString",
+                              self.taskDownloadString, (sRemoteFile, sEncoding, fIgnoreEncodingErrors));
+
+    def syncDownloadString(self, sRemoteFile, sEncoding = 'utf-8', fIgnoreEncodingErrors = True,
+                           cMsTimeout = 30000, fIgnoreErrors = False):
         """Synchronous version."""
-        return self.asyncToSync(self.asyncDownloadString, sRemoteFile, cMsTimeout, fIgnoreErrors);
+        return self.asyncToSync(self.asyncDownloadString, sRemoteFile, sEncoding, fIgnoreEncodingErrors,
+                                cMsTimeout, fIgnoreErrors);
 
     def asyncUnpackFile(self, sRemoteFile, sRemoteDir, cMsTimeout = 30000, fIgnoreErrors = False):

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

@@ -3245 +3245 @@
         return True;
 
-    def txsDownloadString(self, oSession, oTxsSession, sRemoteFile, cMsTimeout = 30000, fIgnoreErrors = False):
+    def txsDownloadString(self, oSession, oTxsSession, sRemoteFile, sEncoding = 'utf-8', fIgnoreEncodingErrors = True,
+                          cMsTimeout = 30000, fIgnoreErrors = False):
         return self.txsDoTask(oSession, oTxsSession, oTxsSession.asyncDownloadString,
-                              (sRemoteFile, self.adjustTimeoutMs(cMsTimeout), fIgnoreErrors));
+                              (sRemoteFile, sEncoding, fIgnoreEncodingErrors, self.adjustTimeoutMs(cMsTimeout), fIgnoreErrors));
 
     def txsUnpackFile(self, oSession, oTxsSession, sRemoteFile, sRemoteDir, cMsTimeout = 30000, fIgnoreErrors = False):