Changeset 79663 in vbox

Timestamp:

Jul 10, 2019 8:41:29 AM (6 years ago)

Author:

vboxsync

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

131971

Message:

ValitdationKit/tdStorageBenchmark1: Adjust for python

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (1 diff)
• storagecfg.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/storage/remoteexecutor.py

@@ -64 +64 @@
         if isinstance(sText, array.array):
             try:
-                return sText.tostring();
+                return str(sText.tostring()); # tostring() returns bytes with python3.
             except:
                 pass;
-        else:
-            return sText;
+        elif isinstance(sText, bytes):
+            return sText.decode('utf-8');
+
+        return sText;
 
     def read(self, cb):

trunk/src/VBox/ValidationKit/tests/storage/storagecfg.py

@@ -488 +488 @@
         if not self.oDiskCfg.isCfgStaticDir():
             # Destroy all volumes first.
-            for sMountPoint in self.dVols.keys(): # pylint: disable=consider-iterating-dictionary
+            for sMountPoint in list(self.dVols.keys()): # pylint: disable=consider-iterating-dictionary
                 self.destroyVolume(sMountPoint);
 
             # Destroy all pools.
-            for sPool in self.dPools.keys(): # pylint: disable=consider-iterating-dictionary
+            for sPool in list(self.dPools.keys()): # pylint: disable=consider-iterating-dictionary
                 self.destroyStoragePool(sPool);