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

Timestamp:

Jun 11, 2019 11:58:28 AM (6 years ago)

Author:

vboxsync

Message:

ValKit: New pylint version - cleanup in progress.

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (1 diff)
• storagecfg.py (modified) (2 diffs)
• tdStorageBenchmark1.py (modified) (9 diffs)
• tdStorageSnapshotMerging1.py (modified) (2 diffs)
• tdStorageStress1.py (modified) (3 diffs)

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

@@ -162 +162 @@
                 oStdIn = StdInOutBuffer(sInput);
             else:
-                oStdIn = '/dev/null'; # pylint: disable=R0204
+                oStdIn = '/dev/null'; # pylint: disable=redefined-variable-type
             fRc = self.oTxsSession.syncExecEx(sExec, (sExec,) + asArgs,
                                               oStdIn = oStdIn, oStdOut = oStdOut,

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

@@ -428 +428 @@
             oStorOs = StorageConfigOsSolaris();
         elif sTargetOs == 'linux':
-            oStorOs = StorageConfigOsLinux(); # pylint: disable=R0204
+            oStorOs = StorageConfigOsLinux(); # pylint: disable=redefined-variable-type
         else:
             fRc = False;
@@ -450 +450 @@
 
         # Destroy all volumes first.
-        for sMountPoint in self.dVols.keys(): # pylint: disable=C0201
+        for sMountPoint in self.dVols.keys(): # pylint: disable=consider-iterating-dictionary
             self.destroyVolume(sMountPoint);
 
         # Destroy all pools.
-        for sPool in self.dPools.keys(): # pylint: disable=C0201
+        for sPool in self.dPools.keys(): # pylint: disable=consider-iterating-dictionary
             self.destroyStoragePool(sPool);
 

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

@@ -36 +36 @@
 import sys;
 if sys.version_info[0] >= 3:
-    from io       import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
+    from io       import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module,useless-import-alias
 else:
-    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
+    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module,useless-import-alias
 
 # Only the main script needs to modify the path.
@@ -61 +61 @@
 def _ControllerTypeToName(eControllerType):
     """ Translate a controller type to a name. """
-    if eControllerType == vboxcon.StorageControllerType_PIIX3 or eControllerType == vboxcon.StorageControllerType_PIIX4:
+    if eControllerType in (vboxcon.StorageControllerType_PIIX3, eControllerType == vboxcon.StorageControllerType_PIIX4,):
         sType = "IDE Controller";
     elif eControllerType == vboxcon.StorageControllerType_IntelAhci:
@@ -67 +67 @@
     elif eControllerType == vboxcon.StorageControllerType_LsiLogicSas:
         sType = "SAS Controller";
-    elif eControllerType == vboxcon.StorageControllerType_LsiLogic or eControllerType == vboxcon.StorageControllerType_BusLogic:
+    elif eControllerType in (vboxcon.StorageControllerType_LsiLogic, vboxcon.StorageControllerType_BusLogic,):
         sType = "SCSI Controller";
     elif eControllerType == vboxcon.StorageControllerType_NVMe:
@@ -404 +404 @@
         return asTestCfg;
 
-class tdStorageBenchmark(vbox.TestDriver):                                      # pylint: disable=R0902
+class tdStorageBenchmark(vbox.TestDriver):                                      # pylint: disable=too-many-instance-attributes
     """
     Storage benchmark.
@@ -579 +579 @@
         return rc;
 
-    def parseOption(self, asArgs, iArg):                                        # pylint: disable=R0912,R0915
+    def parseOption(self, asArgs, iArg):                                        # pylint: disable=too-many-branches,too-many-statements
         if asArgs[iArg] == '--virt-modes':
             iArg += 1;
@@ -944 +944 @@
             oTst = IozoneTest(oExecutor, dTestSet);
         elif sBenchmark == 'fio':
-            oTst = FioTest(oExecutor, dTestSet); # pylint: disable=R0204
+            oTst = FioTest(oExecutor, dTestSet); # pylint: disable=redefined-variable-type
 
         if oTst is not None:
@@ -1045 +1045 @@
         return (None, None);
 
-    def testOneCfg(self, sVmName, eStorageController, sHostIoCache, sDiskFormat, # pylint: disable=R0913,R0914,R0915
+    def testOneCfg(self, sVmName, eStorageController, sHostIoCache, sDiskFormat, # pylint: disable=too-many-arguments,too-many-locals,too-many-statements
                    sDiskVariant, sDiskPath, cCpus, sIoTest, sVirtMode, sTestSet):
         """
@@ -1109 +1109 @@
 
                 iDevice = 0;
-                if eStorageController == vboxcon.StorageControllerType_PIIX3 or \
-                   eStorageController == vboxcon.StorageControllerType_PIIX4:
+                if eStorageController in (vboxcon.StorageControllerType_PIIX3, vboxcon.StorageControllerType_PIIX4,):
                     iDevice = 1; # Master is for the OS.
 
@@ -1141 +1140 @@
 
                         iLun = 0;
-                        if eStorageController == vboxcon.StorageControllerType_PIIX3 or \
-                           eStorageController == vboxcon.StorageControllerType_PIIX4:
+                        if eStorageController in (vboxcon.StorageControllerType_PIIX3, vboxcon.StorageControllerType_PIIX4,):
                             iLun = 1
                         sDrv, fDrvScsi = self.getStorageDriverFromEnum(eStorageController, True);

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

@@ -79 +79 @@
 
 
-class tdStorageSnapshot(vbox.TestDriver):                                      # pylint: disable=R0902
+class tdStorageSnapshot(vbox.TestDriver):                                      # pylint: disable=too-many-instance-attributes
     """
     Storage benchmark.
@@ -109 +109 @@
         return rc;
 
-    def parseOption(self, asArgs, iArg):                                        # pylint: disable=R0912,R0915
+    def parseOption(self, asArgs, iArg):                                        # pylint: disable=too-many-branches,too-many-statements
         if asArgs[iArg] == '--storage-ctrls':
             iArg += 1;

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

@@ -60 +60 @@
     return sType;
 
-class tdStorageStress(vbox.TestDriver):                                      # pylint: disable=R0902
+class tdStorageStress(vbox.TestDriver):                                      # pylint: disable=too-many-instance-attributes
     """
     Storage testcase.
@@ -125 +125 @@
         return rc;
 
-    def parseOption(self, asArgs, iArg):                                        # pylint: disable=R0912,R0915
+    def parseOption(self, asArgs, iArg):                                        # pylint: disable=too-many-branches,too-many-statements
         if asArgs[iArg] == '--virt-modes':
             iArg += 1;
@@ -326 +326 @@
         return fRc;
 
-    # pylint: disable=R0913
+    # pylint: disable=too-many-arguments
 
     def test1OneCfg(self, sVmName, eStorageController, sDiskFormat, sDiskPath1, sDiskPath2, \