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

Timestamp:

May 20, 2020 4:50:27 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Decoding fixes for FileWrapper output.

File:

• trunk/src/VBox/ValidationKit/testdriver/reporter.py (modified) (2 diffs)

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

@@ -1212 +1212 @@
     def write(self, sText):
         """file.write"""
-        if isinstance(sText, array.array):
-            try:
-                sText = sText.tostring();
-            except:
-                pass;
+        if not utils.isString(sText):
+            if isinstance(sText, array.array):
+                try:
+                    sText = sText.tostring();
+                except:
+                    pass;
+            if hasattr(sText, 'decode'):
+                try:
+                    sText = sText.decode('utf-8', 'ignore');
+                except:
+                    pass;
         g_oLock.acquire();
         try:
@@ -1271 +1277 @@
                 try:    sText = sText.tostring();
                 except: pass;
-            if not utils.isString(sText) and hasattr(sText, 'decode'):
+            if hasattr(sText, 'decode'):
                 try:    sText = sText.decode('utf-8', 'ignore');
                 except: pass;