Changeset 71548 in vbox for trunk

Timestamp:

Mar 28, 2018 3:54:20 PM (7 years ago)

Author:

vboxsync

Message:

bugref:8345. Coding style fixes.

File:

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

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

@@ -172 +172 @@
 
         fRc = True
-        iLen = 0
 
         for key, value in self.dsKeys.iteritems():
@@ -237 +236 @@
         asStateFilesList = set()
         sFolder = oMachine.snapshotFolder
-        for file in os.listdir(sFolder):
-            if file.endswith(".sav"):
-                sFile = os.path.join(sFolder, file)
-                asStateFilesList.add(sFile)
+        for sFile in os.listdir(sFolder):
+            if sFile.endswith(".sav"):
+                sFullPath = os.path.join(sFolder, sFile)
+                asStateFilesList.add(sFullPath)
                 if fPrint is True:
-                    reporter.log("State file is %s" % (sFile))
+                    reporter.log("State file is %s" % (sFullPath))
         return asStateFilesList
 
@@ -248 +247 @@
         asSnapshotsFilesList = set()
         sFolder = oMachine.snapshotFolder
-        for file in os.listdir(sFolder):
-            if file.endswith(".sav") is False:
-                sFile = os.path.join(sFolder, file)
-                asSnapshotsFilesList.add(sFile)
+        for sFile in os.listdir(sFolder):
+            if sFile.endswith(".sav") is False:
+                sFullPath = os.path.join(sFolder, sFile)
+                asSnapshotsFilesList.add(sFullPath)
                 if fPrint is True:
-                    reporter.log("Snapshot file is %s" % (sFile))
+                    reporter.log("Snapshot file is %s" % (sFullPath))
         return asSnapshotsFilesList
 
@@ -259 +258 @@
         asLogFilesList = set()
         sFolder = oMachine.logFolder
-        for file in os.listdir(sFolder):
-            if file.endswith(".log"):
-                sFile = os.path.join(sFolder, file)
-                asLogFilesList.add(sFile)
+        for sFile in os.listdir(sFolder):
+            if sFile.endswith(".log"):
+                sFullPath = os.path.join(sFolder, sFile)
+                asLogFilesList.add(sFullPath)
                 if fPrint is True:
-                    reporter.log("Log file is %s" % (sFile))
+                    reporter.log("Log file is %s" % (sFullPath))
         return asLogFilesList
 
@@ -596 +595 @@
                 for oAttachment in aoMediumAttachments:
                     sRes = oAttachment.medium.location.rpartition(os.sep)
-                    dsReferenceFiles['SnapshotFile'].add(sNewLoc + os.sep + oMachine.name + os.sep + 
+                    dsReferenceFiles['SnapshotFile'].add(sNewLoc + os.sep + oMachine.name + os.sep +
                                                          'Snapshots' + os.sep + sRes[2])