Changeset 84246 in vbox for trunk/src/VBox

Timestamp:

May 11, 2020 10:36:00 AM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl: Some more std[err|out] output fixes.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -2257 +2257 @@
                                         reporter.log2('Process (PID %d) got %d bytes of %s data (type: %s)'
                                                       % (iPid, len(abBuf), sFdNm, type(abBuf)));
-                                        if isinstance(abBuf, str):
-                                            pass;
+                                        sBuf = '';
                                         if sys.version_info >= (2, 7):
                                             if isinstance(abBuf, memoryview): ## @todo Why is this happening?
                                                 abBuf = abBuf.tobytes();
-                                        for sLine in abBuf.decode("utf-8").splitlines():
+                                                sBuf  = abBuf.decode("utf-8");
+                                        if isinstance(abBuf, buffer):
+                                            sBuf = abBuf;
+                                        for sLine in sBuf.splitlines():
                                             reporter.log('%s: %s' % (sFdNm, sLine));
                                         acbFdOut[iFd] += len(abBuf);