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

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/core

Files:

• build.py (modified) (1 diff)
• report.py (modified) (1 diff)
• restdispatcher.py (modified) (1 diff)
• schedulerbeci.py (modified) (1 diff)
• testboxcontroller.py (modified) (1 diff)
• testcase.py (modified) (2 diffs)
• testset.py (modified) (3 diffs)
• webservergluebase.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/build.py

@@ -739 +739 @@
         asOsAgnosticArch = [];
         asOsNoArch       = [];
-        for i in range(len(oBuildEx.oCat.asOsArches)):
-            asParts = oBuildEx.oCat.asOsArches[i].split('.');
+        for sOsArch in oBuildEx.oCat.asOsArches:
+            asParts = sOsArch.split('.');
             if len(asParts) != 2 or not asParts[0] or not asParts[1]:
                 raise self._oDb.integrityException('Bad build asOsArches value: %s (idBuild=%s idBuildCategory=%s)'
-                                                   % (oBuildEx.asOsArches[i], oBuildEx.idBuild, oBuildEx.idBuildCategory));
+                                                   % (sOsArch, oBuildEx.idBuild, oBuildEx.idBuildCategory));
             asOsNoArch.append(asParts[0] + '.noarch');
             asOsNoArch.append('os-agnostic.' + asParts[1]);

trunk/src/VBox/ValidationKit/testmanager/core/report.py

@@ -1222 +1222 @@
             #
             for oSeries in oCollection.aoSeries:
-                for i in range(len(oSeries.aiRevisions)):
-                    oSeries.aoRevInfo.append(self.oCache.getVcsRevInfo(sCurRepository, oSeries.aiRevisions[i]));
+                for iRevision in oSeries.aiRevisions:
+                    oSeries.aoRevInfo.append(self.oCache.getVcsRevInfo(sCurRepository, iRevision));
             aoRet.append(oCollection);
 

trunk/src/VBox/ValidationKit/testmanager/core/restdispatcher.py

@@ -220 +220 @@
         if not os.path.exists(os.path.dirname(sFile)):
             os.makedirs(os.path.dirname(sFile), 0o755);
-        oFile = open(sFile, 'ab');
-
-        # Check the size.
-        fSizeOk = True;
-        if not fIgnoreSizeCheck:
-            oStat = os.fstat(oFile.fileno());
-            fSizeOk = oStat.st_size / (1024 * 1024) < config.g_kcMbMaxMainLog;
-
-        # Write the text.
-        if fSizeOk:
-            if sys.version_info[0] >= 3:
-                oFile.write(bytes(sText, 'utf-8'));
-            else:
-                oFile.write(sText);
-
-        # Done
-        oFile.close();
+
+        with open(sFile, 'ab') as oFile:
+            # Check the size.
+            fSizeOk = True;
+            if not fIgnoreSizeCheck:
+                oStat = os.fstat(oFile.fileno());
+                fSizeOk = oStat.st_size / (1024 * 1024) < config.g_kcMbMaxMainLog;
+
+            # Write the text.
+            if fSizeOk:
+                if sys.version_info[0] >= 3:
+                    oFile.write(bytes(sText, 'utf-8'));
+                else:
+                    oFile.write(sText);
+
         return fSizeOk;
 

trunk/src/VBox/ValidationKit/testmanager/core/schedulerbeci.py

@@ -75 +75 @@
         #
         cMaxItems = len(oData.aoArgsVariations) * 64;
-        if cMaxItems > 1048576:
-            cMaxItems = 1048576;
+        cMaxItems = min(cMaxItems, 1048576);
 
         aoItems   = list();

trunk/src/VBox/ValidationKit/testmanager/core/testboxcontroller.py

@@ -327 +327 @@
         if not os.path.exists(os.path.dirname(sFile)):
             os.makedirs(os.path.dirname(sFile), 0o755);
-        oFile = open(sFile, 'ab');
-
-        # Check the size.
-        fSizeOk = True;
-        if not fIgnoreSizeCheck:
-            oStat = os.fstat(oFile.fileno());
-            fSizeOk = oStat.st_size / (1024 * 1024) < config.g_kcMbMaxMainLog;
-
-        # Write the text.
-        if fSizeOk:
-            if sys.version_info[0] >= 3:
-                oFile.write(bytes(sText, 'utf-8'));
-            else:
-                oFile.write(sText);
-
-        # Done
-        oFile.close();
+
+        with open(sFile, 'ab') as oFile:
+            # Check the size.
+            fSizeOk = True;
+            if not fIgnoreSizeCheck:
+                oStat = os.fstat(oFile.fileno());
+                fSizeOk = oStat.st_size / (1024 * 1024) < config.g_kcMbMaxMainLog;
+
+            # Write the text.
+            if fSizeOk:
+                if sys.version_info[0] >= 3:
+                    oFile.write(bytes(sText, 'utf-8'));
+                else:
+                    oFile.write(sText);
+
         return fSizeOk;
 

trunk/src/VBox/ValidationKit/testmanager/core/testcase.py

@@ -902 +902 @@
             dErrors = {};
 
-            for iVar in range(len(self.aoTestCaseArgs)):
-                oVar = copy.copy(self.aoTestCaseArgs[iVar]);
+            for iVar, oVar in enumerate(self.aoTestCaseArgs):
+                oVar = copy.copy(oVar);
                 oVar.idTestCase = self.idTestCase;
                 dCurErrors = oVar.validateAndConvert(oDb, ModelDataBase.ksValidateFor_Other);
@@ -915 +915 @@
                 aoNewValues.append(oVar);
 
-            for iVar in range(len(self.aoTestCaseArgs)):
-                sArgs = self.aoTestCaseArgs[iVar].sArgs;
+            for iVar, oVar in enumerate(self.aoTestCaseArgs):
+                sArgs = oVar.sArgs;
                 for iVar2 in range(iVar + 1, len(self.aoTestCaseArgs)):
                     if self.aoTestCaseArgs[iVar2].sArgs == sArgs:

trunk/src/VBox/ValidationKit/testmanager/core/testset.py

@@ -194 +194 @@
         sFile1 = os.path.join(config.g_ksFileAreaRootDir, self.sBaseFilename + '-' + sFilename);
         try:
-            oFile = open(sFile1, sMode);
+            oFile = open(sFile1, sMode);                        # pylint: disable=consider-using-with
             return (oFile, os.fstat(oFile.fileno()).st_size, False);
         except Exception as oXcpt1:
@@ -200 +200 @@
             sFile2 = os.path.join(config.g_ksZipFileAreaRootDir, self.sBaseFilename + '.zip');
             try:
-                oZipFile    = zipfile.ZipFile(sFile2, 'r');
-                oFile       = oZipFile.open(sFilename, sMode if sMode != 'rb' else 'r');
+                oZipFile    = zipfile.ZipFile(sFile2, 'r');                              # pylint: disable=consider-using-with
+                oFile       = oZipFile.open(sFilename, sMode if sMode != 'rb' else 'r'); # pylint: disable=consider-using-with
                 cbFile      = oZipFile.getinfo(sFilename).file_size;
                 return (oFile, cbFile, True);
@@ -230 +230 @@
             if not os.path.exists(os.path.dirname(sFile1)):
                 os.makedirs(os.path.dirname(sFile1), 0o755);
-            oFile = open(sFile1, sMode);
+            oFile = open(sFile1, sMode);                        # pylint: disable=consider-using-with
         except Exception as oXcpt1:
             return str(oXcpt1);

trunk/src/VBox/ValidationKit/testmanager/core/webservergluebase.py

@@ -138 +138 @@
         self._oDbgFile         = sys.stderr;
         if config.g_ksSrvGlueDebugLogDst is not None and config.g_kfSrvGlueDebug is True:
-            self._oDbgFile = open(config.g_ksSrvGlueDebugLogDst, 'a');
+            self._oDbgFile = open(config.g_ksSrvGlueDebugLogDst, 'a');  # pylint: disable=consider-using-with
             if config.g_kfSrvGlueCgiDumpArgs:
                 self._oDbgFile.write('Arguments: %s\nEnvironment:\n' % (sys.argv,));
@@ -303 +303 @@
         """
         if self._fHeaderWrittenOut is False:
-            for sKey in self._dHeaderFields:
-                self._writeHeader('%s: %s\n' % (sKey, self._dHeaderFields[sKey]));
+            for sKey, sValue in self._dHeaderFields.items():
+                self._writeHeader('%s: %s\n' % (sKey, sValue,));
             self._fHeaderWrittenOut = True;
             self._writeHeader('\n'); # End of header indicator.
@@ -462 +462 @@
 
         try:
-            oFile = open(sLogFile, 'w');
-            oFile.write(sError + '\n\n');
-            if aXcptInfo[0] is not None:
-                oFile.write(' B a c k t r a c e\n');
-                oFile.write('===================\n');
-                oFile.write(cgitb.text(aXcptInfo, 5));
-                oFile.write('\n\n');
-
-            oFile.write(' D e b u g   I n f o\n');
-            oFile.write('=====================\n\n');
-            self._fHtmlDebugOutput = False;
-            self.debugDumpStuff(oFile.write);
-
-            oFile.close();
+            with open(sLogFile, 'w') as oFile:
+                oFile.write(sError + '\n\n');
+                if aXcptInfo[0] is not None:
+                    oFile.write(' B a c k t r a c e\n');
+                    oFile.write('===================\n');
+                    oFile.write(cgitb.text(aXcptInfo, 5));
+                    oFile.write('\n\n');
+
+                oFile.write(' D e b u g   I n f o\n');
+                oFile.write('=====================\n\n');
+                self._fHtmlDebugOutput = False;
+                self.debugDumpStuff(oFile.write);
         except:
             fRc = False;