Changeset 85468 in vbox

Timestamp:

Jul 27, 2020 12:48:09 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9341: Fixed case sensitivity issue in the autostart test

File:

• trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py

@@ -3 +3 @@
 
 """
-AUtostart testcase using.
+Autostart testcase using.
 """
+from pykickstart.commands import repo
 
 __copyright__ = \
@@ -380 +381 @@
                                 reporter.log2('Reading %s ...' % (sFdNm,));
                                 try:
-                                    abBuf = oProcess.Read(1, 64 * 1024, cMsTimeout);
+                                    abBuf = oProcess.read(iFd, 64 * 1024, cMsTimeout);
                                 except KeyboardInterrupt: # Not sure how helpful this is, but whatever.
                                     reporter.error('Process (PID %d) execution interrupted' % (iPid,));
@@ -392 +393 @@
                                         acbFdOut[iFd] += len(abBuf);
                                         ## @todo Figure out how to uniform + append!
+                                        sBuf = '';
+                                        if sys.version_info >= (2, 7) and isinstance(abBuf, memoryview): ## @todo Why is this happening?
+                                            abBuf = abBuf.tobytes();
+                                            sBuf  = abBuf.decode("utf-8");
+                                        else:
+                                            sBuf = str(abBuf);
                                         if aBuf:
-                                            aBuf += str(abBuf);
+                                            aBuf += sBuf;
                                         else:
-                                            aBuf = str(abBuf);
+                                            aBuf = sBuf;
 
                         ## Process input (todo):