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

Timestamp:

Jul 10, 2019 8:40:51 AM (5 years ago)

Author:

vboxsync

Message:

ValidationKit/txsclient.py: Fix python 3.x incompatibility when handling stdin packets in the EXEC task. zlib.crc32 wants bytes or an array of bytes as the input type and creating a byte array requires the input string to be encoded as bytes

File:

• trunk/src/VBox/ValidationKit/testdriver/txsclient.py (modified) (1 diff)

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

@@ -770 +770 @@
                         break;
                     if sInput:
-                        oStdIn.uTxsClientCrc32 = zlib.crc32(sInput, oStdIn.uTxsClientCrc32);
                         # Convert to a byte array before handing it of to sendMsg or the string
                         # will get some zero termination added breaking the CRC (and injecting
                         # unwanted bytes).
-                        abInput = array.array('B', sInput);
+                        abInput = array.array('B', sInput.encode('utf-8'));
+                        oStdIn.uTxsClientCrc32 = zlib.crc32(abInput, oStdIn.uTxsClientCrc32);
                         rc = self.sendMsg('STDIN', (long(oStdIn.uTxsClientCrc32 & 0xffffffff), abInput));
                         if rc is not True: