Changeset 70660 in vbox for trunk/src/VBox/ValidationKit/tests/storage

Timestamp:

Jan 21, 2018 4:18:58 PM (7 years ago)

Author:

vboxsync

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

120396

Message:

ValidationKit: Python 3 and pylint 1.8.1 adjustments/fixes.

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (2 diffs)
• storagecfg.py (modified) (4 diffs)
• tdStorageBenchmark1.py (modified) (3 diffs)

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

@@ -34 +34 @@
 import os;
 import shutil;
-import StringIO
+import sys;
+if sys.version_info[0] >= 3:
+    from io import StringIO as StringIO;            # pylint: disable=import-error,no-name-in-module
+else:
+    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
 import subprocess;
 
@@ -41 +45 @@
 from testdriver import reporter;
 
+
+
 class StdInOutBuffer(object):
     """ Standard input output buffer """
 
     def __init__(self, sInput = None):
-        self.sInput = StringIO.StringIO();
+        self.sInput = StringIO();
         if sInput is not None:
             self.sInput.write(self._toString(sInput));

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

@@ -315 +315 @@
         fRc = True;
         sBlkDev = None;
-        if self.dSimplePools.has_key(sPool):
+        if sPool in self.dSimplePools:
             sDiskPath = self.dSimplePools.get(sPool);
             if sDiskPath.find('zram') != -1:
@@ -357 +357 @@
         self.dMounts.pop(sPool + '/' + sVol);
         oExec.rmDir(sMountPoint);
-        if self.dSimplePools.has_key(sPool):
+        if sPool in self.dSimplePools:
             # Wipe partition table
             sDiskPath = self.dSimplePools.get(sPool);
@@ -372 +372 @@
         """
         fRc = True;
-        if self.dSimplePools.has_key(sPool):
+        if sPool in self.dSimplePools:
             self.dSimplePools.pop(sPool);
         else:
@@ -565 +565 @@
         fRc = True;
         sMountPoint = None;
-        if self.dPools.has_key(sPool):
+        if sPool in self.dPools:
             sVol = 'vol' + str(self.iVolId);
             sMountPoint = self.oStorOs.getMntBase() + '/' + sVol;

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

@@ -35 +35 @@
 import socket;
 import sys;
-import StringIO;
+if sys.version_info[0] >= 3:
+    from io       import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
+else:
+    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
 
 # Only the main script needs to modify the path.
@@ -97 +100 @@
             return False;
 
-        cfgBuf = StringIO.StringIO();
+        cfgBuf = StringIO();
         cfgBuf.write('[global]\n');
         cfgBuf.write('bs=' + self.dCfg.get('RecordSize', '4k') + '\n');
@@ -1143 +1146 @@
 
                         sIoLogFile = '%s/%s.iolog' % (self.sIoLogPath, sDrv);
-                        print sCfgmPath;
-                        print sIoLogFile;
+                        print(sCfgmPath);
+                        print(sIoLogFile);
                         oSession.o.machine.setExtraData('%s/IoLog' % (sCfgmPath,), sIoLogFile);
                     except: