Changeset 70855 in vbox for trunk/src/VBox/ValidationKit/tests/api/tdMoveMedium1.py

Timestamp:

Feb 2, 2018 1:52:40 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: address pylint issues

File:

• trunk/src/VBox/ValidationKit/tests/api/tdMoveMedium1.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/tests/api/tdMoveMedium1.py

@@ -91 +91 @@
             sActualFilePath = oAttachment.medium.location
             if not os.path.samefile(sFilePath, sActualFilePath):
-                reporter.log('medium location expected to be "%s" but is "%s"', (sFilePath, sActualFilePath))
+                reporter.log('medium location expected to be "%s" but is "%s"' % (sFilePath, sActualFilePath))
                 fRc = False;
             if not os.path.exists(sFilePath):
-                reporter.log('medium file does not exist at "%s"', (sFilePath))
+                reporter.log('medium file does not exist at "%s"' % (sFilePath,))
                 fRc = False;
         return fRc
@@ -135 +135 @@
                 # attach HDD, IDE controller exists by default, but we use SATA just in case
                 sController='SATA Controller'
-                fRc = fRc and oSession.attachHd(sHddPath, sController, iPort = len(asFiles), fImmutable=False, fForceResource=False)
+                fRc = fRc and oSession.attachHd(sHddPath, sController, iPort = len(asFiles),
+                                                fImmutable=False, fForceResource=False)
                 if fRc:
                     asFiles.append(sFile)
@@ -157 +158 @@
             #case 3. Path with file name
             fRc = self.setLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments) and fRc
-            asNewFiles = list(map(lambda s: 'newName' + os.path.splitext(s)[1], asFiles))
+            asNewFiles = ['newName' + os.path.splitext(s)[1] for s in asFiles]
             fRc = self.checkLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments, asFiles) and fRc
             # BUG! the check above succeeds, but it actually should be the one below which does
@@ -164 +165 @@
             #case 4. Only file name
             fRc = self.setLocation('onlyMediumName', aoMediumAttachments) and fRc
-            asNewFiles = list(map(lambda s: 'onlyMediumName' + os.path.splitext(s)[1], asFiles))
+            asNewFiles = ['onlyMediumName' + os.path.splitext(s)[1] for s in asFiles]
             fRc = self.checkLocation(os.path.join(sNewLoc, 'newName'), aoMediumAttachments,
-                                     list(map(lambda s: s.replace('.hdd', '.parallels'), asNewFiles))) and fRc
+                                     [s.replace('.hdd', '.parallels') for s in asNewFiles]) and fRc
             # BUG! due to the above path mishandling the check above succeeds, the directory issue is
             # a consequence of the bug in case 3, but the extension is also picked incorrectly, it is
@@ -176 +177 @@
             if fRc:
                 aoMediumAttachments = oVM.getMediumAttachmentsOfController(sController)
-                asSnapFiles = list(map(lambda o: os.path.basename(o.medium.name), aoMediumAttachments))
+                asSnapFiles = [os.path.basename(o.medium.name) for o in aoMediumAttachments]
                 fRc = self.setLocation(sOrigLoc, aoMediumAttachments) and fRc
                 fRc = self.checkLocation(sOrigLoc, aoMediumAttachments, asSnapFiles) and fRc