Changeset 94129 in vbox for trunk/src/VBox/ValidationKit/testmanager/batch

Timestamp:

Mar 8, 2022 2:57:25 PM (3 years ago)

Author:

vboxsync

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

150378

Message:

testmanager: pylint 2.9.6 adjustments (mostly about using sub-optimal looping and 'with' statements).

Location:

trunk/src/VBox/ValidationKit/testmanager/batch

Files:

• filearchiver.py (modified) (2 diffs)
• vcs_import.py (modified) (2 diffs)
• virtual_test_sheriff.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testmanager/batch/filearchiver.py

@@ -123 +123 @@
 
                     utils.noxcptDeleteFile(sZipFileNm + '.tmp');
-                    oZipFile = zipfile.ZipFile(sZipFileNm + '.tmp', 'w', zipfile.ZIP_DEFLATED, allowZip64 = True);
-
-                    for sFile in asFiles:
-                        sSuff = os.path.splitext(sFile)[1];
-                        if sSuff in [ '.png', '.webm', '.gz', '.bz2', '.zip', '.mov', '.avi', '.mpg', '.gif', '.jpg' ]:
-                            ## @todo Consider storing these files outside the zip if they are a little largish.
-                            self.dprint('TestSet %d: Storing   %s...' % (idTestSet, sFile));
-                            oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_STORED);
-                        else:
-                            self.dprint('TestSet %d: Deflating %s...' % (idTestSet, sFile));
-                            oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_DEFLATED);
-
-                    oZipFile.close();
+                    with zipfile.ZipFile(sZipFileNm + '.tmp', 'w', zipfile.ZIP_DEFLATED, allowZip64 = True) as oZipFile:
+                        for sFile in asFiles:
+                            sSuff = os.path.splitext(sFile)[1];
+                            if sSuff in [ '.png', '.webm', '.gz', '.bz2', '.zip', '.mov', '.avi', '.mpg', '.gif', '.jpg' ]:
+                                ## @todo Consider storing these files outside the zip if they are a little largish.
+                                self.dprint('TestSet %d: Storing   %s...' % (idTestSet, sFile));
+                                oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_STORED);
+                            else:
+                                self.dprint('TestSet %d: Deflating %s...' % (idTestSet, sFile));
+                                oZipFile.write(sSrcFileBase + sFile, sFile, zipfile.ZIP_DEFLATED);
 
                     #
@@ -216 +213 @@
         #
         fRc = True;
-        for idTestSet in dTestSets:
+        for idTestSet, oTestSet in dTestSets.items():
             try:
-                if self._processTestSet(idTestSet, dTestSets[idTestSet], sCurDir) is not True:
+                if self._processTestSet(idTestSet, oTestSet, sCurDir) is not True:
                     fRc = False;
             except:

trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py

@@ -43 +43 @@
 
 # Test Manager imports
-from testmanager.config                 import g_kaBugTrackers;
+from testmanager.config                 import g_kdBugTrackers;
 from testmanager.core.db                import TMDatabaseConnection;
 from testmanager.core.vcsrevisions      import VcsRevisionData, VcsRevisionLogic;
@@ -158 +158 @@
 
             # Analyze the raw message looking for bug tracker references.
-            for sBugTrackerKey in g_kaBugTrackers:
-                oBugTracker = g_kaBugTrackers[sBugTrackerKey];
+            for oBugTracker in g_kdBugTrackers.values():
                 for sTag in oBugTracker.asCommitTags:
                     off = sRawMsg.find(sTag);

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -340 +340 @@
 
         if self.oConfig.sLogFile:
-            self.oLogFile = open(self.oConfig.sLogFile, "a");
+            self.oLogFile = open(self.oConfig.sLogFile, "a");   # pylint: disable=consider-using-with
             self.oLogFile.write('VirtualTestSheriff: $Revision$ \n');
 
@@ -518 +518 @@
                         ## @todo maybe check the elapsed time here, it could still be a bad run?
                         cOkay += 1;
-                        if iFirstOkay > iSet:
-                            iFirstOkay = iSet;
+                        iFirstOkay = min(iFirstOkay, iSet);
                 if iSet > 10:
                     break;
@@ -1030 +1029 @@
             #
             cHits = 0;
-            for iCpu in dStacks:
-                asBacktrace = dStacks[iCpu];
+            for asBacktrace in dStacks.values():
                 for iFrame in xrange(min(3, len(asBacktrace))):
                     if asBacktrace[iFrame].find('kvm_lock_spinning') >= 0: