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

Timestamp:

Mar 7, 2017 10:30:26 AM (8 years ago)

Author:

vboxsync

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

113789

Message:

ValidationKit/tests: pylint 2.0.0 fixes.

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (1 diff)
• storagecfg.py (modified) (1 diff)
• tdStorageBenchmark1.py (modified) (10 diffs)

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

@@ -101 +101 @@
         if self.oTxsSession is not None:
             return self.oTxsSession.syncIsFile(sFile);
-        else:
-            return os.path.isfile(sFile);
+        return os.path.isfile(sFile);
 
     def _getBinaryPath(self, sBinary):

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

@@ -291 +291 @@
             fRc = oExec.execBinaryNoStdOut('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), sFdiskScript);
             if fRc:
-                if sDiskPath.find('nvme') is not -1:
+                if sDiskPath.find('nvme') != -1:
                     sBlkDev = sDiskPath + 'p1';
                 else:

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

@@ -228 +228 @@
                         # Extract the value
                         idxValue = sLine.rfind('=');
-                        if idxValue is -1:
+                        if idxValue == -1:
                             raise Exception('IozoneTest: Invalid state');
 
@@ -243 +243 @@
 
                         for sNeedle, sTestVal in self.lstTests:
-                            if sLine.rfind(sNeedle) is not -1:
+                            if sLine.rfind(sNeedle) != -1:
                                 reporter.testValue(sTestVal, sLine[idxValue:idxValueEnd],
                                                    constants.valueunit.g_asNames[constants.valueunit.KILOBYTES_PER_SEC]);
@@ -281 +281 @@
         # Get the first non blacklisted test.
         asTestCfg = self.getCurrentTestCfg();
-        while len(asTestCfg) > 0 and self.isTestCfgBlacklisted(asTestCfg):
+        while asTestCfg and self.isTestCfgBlacklisted(asTestCfg):
             asTestCfg = self.advanceTestCfg();
 
@@ -305 +305 @@
         if fnTestFmt is not None:
             return fnTestFmt(oCfg);
-        else:
-            return oCfg;
+        return oCfg;
 
     def isTestCfgBlacklisted(self, asTestCfg):
@@ -375 +374 @@
 
         asTestCfg = self.advanceTestCfg();
-        while len(asTestCfg) > 0 and self.isTestCfgBlacklisted(asTestCfg):
+        while asTestCfg and self.isTestCfgBlacklisted(asTestCfg):
             asTestCfg = self.advanceTestCfg();
 
@@ -381 +380 @@
         # categories.
         reporter.testDone(fSkippedLast);
-        if len(asTestCfg) > 0:
+        if asTestCfg:
             idxSame = 0;
             while asTestCfgCur[idxSame] == asTestCfg[idxSame]:
@@ -832 +831 @@
             if fHardDisk:
                 return ('ahci', False);
-            else:
-                return ('ahci', True);
-        elif eStorageCtrl == vboxcon.StorageControllerType_PIIX4:
+            return ('ahci', True);
+        if eStorageCtrl == vboxcon.StorageControllerType_PIIX4:
             return ('piix3ide', False);
-        elif eStorageCtrl == vboxcon.StorageControllerType_LsiLogicSas:
+        if eStorageCtrl == vboxcon.StorageControllerType_LsiLogicSas:
             return ('lsilogicsas', True);
-        elif eStorageCtrl == vboxcon.StorageControllerType_LsiLogic:
+        if eStorageCtrl == vboxcon.StorageControllerType_LsiLogic:
             return ('lsilogicscsi', True);
-        elif eStorageCtrl == vboxcon.StorageControllerType_BusLogic:
+        if eStorageCtrl == vboxcon.StorageControllerType_BusLogic:
             return ('buslogic', True);
-        elif eStorageCtrl == vboxcon.StorageControllerType_NVMe:
+        if eStorageCtrl == vboxcon.StorageControllerType_NVMe:
             return ('nvme', False);
 
@@ -854 +852 @@
         # Check whether the disk variant is supported by the selected format.
         asVariants = self.getDiskFormatVariantsForTesting(asTestCfg[self.kiDiskFmt], [ asTestCfg[self.kiDiskVar] ]);
-        if len(asVariants) == 0:
+        if not asVariants:
             return False;
 
         # For iSCSI check whether we have targets configured.
-        if asTestCfg[self.kiDiskFmt] == 'iSCSI' and len(self.asIscsiTargets) == 0:
+        if asTestCfg[self.kiDiskFmt] == 'iSCSI' and not self.asIscsiTargets:
             return False;
 
@@ -879 +877 @@
         if cCpus == 1:
             return '1 cpu';
-        else:
-            return '%u cpus' % (cCpus);
+        return '%u cpus' % (cCpus);
 
     def fnFormatVirtMode(self, sVirtMode):
@@ -1172 +1169 @@
         fRc = True;
         asTestCfg = oTstCfgMgr.getCurrentTestCfg();
-        while len(asTestCfg) > 0:
+        while asTestCfg:
             fRc = self.testOneCfg(asTestCfg[self.kiVmName], self.getStorageCtrlFromName(asTestCfg[self.kiStorageCtrl]), \
                                   asTestCfg[self.kiHostIoCache], asTestCfg[self.kiDiskFmt], asTestCfg[self.kiDiskVar],