Changeset 94126 in vbox for trunk

Timestamp:

Mar 8, 2022 2:18:58 PM (3 years ago)

Author:

vboxsync

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

150375

Message:

ValKit/testdriver: pylint 2.9.6 adjustments (mostly about using 'with' statements).

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• btresolver.py (modified) (1 diff)
• reporter.py (modified) (1 diff)
• testfileset.py (modified) (2 diffs)
• tst-txsclient.py (modified) (1 diff)
• vbox.py (modified) (1 diff)
• vboxinstaller.py (modified) (3 diffs)
• vboxtestvms.py (modified) (1 diff)
• vboxwrappers.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testdriver/btresolver.py ¶

@@ -599 +599 @@
                         asArgs.append(sLoadAddr);
 
-                oRTLdrFltProc = subprocess.Popen(asArgs, stdin=subprocess.PIPE, stdout=subprocess.PIPE, bufsize=0);
+                oRTLdrFltProc = subprocess.Popen(asArgs, stdin=subprocess.PIPE,         # pylint: disable=consider-using-with
+                                                 stdout=subprocess.PIPE, bufsize=0);
                 if oRTLdrFltProc is not None:
                     sReportAn, _ = oRTLdrFltProc.communicate(sReport);

trunk/src/VBox/ValidationKit/testdriver/reporter.py ¶

@@ -71 +71 @@
 
         # Take the lock.
-        if not self.oLock.acquire():
+        if not self.oLock.acquire():                            # pylint: disable=consider-using-with
             return False;
 

trunk/src/VBox/ValidationKit/testdriver/testfileset.py ¶

@@ -517 +517 @@
             # has been changed to tarfile.PAX_FORMAT, which our extraction code (vts_tar) currently can't handle.
             ## @todo Remove tarfile.GNU_FORMAT and use tarfile.PAX_FORMAT as soon as we have PAX support.
-            oTarFile = tarfile.open(sTarFileHst, 'w:gz', format = tarfile.GNU_FORMAT);
+            oTarFile = tarfile.open(sTarFileHst, 'w:gz', format = tarfile.GNU_FORMAT);  # pylint: disable=consider-using-with
         except:
             return reporter.errorXcpt('Failed to open new tar file: %s' % (sTarFileHst,));
@@ -592 +592 @@
 
             try:
-                oOutFile = open(sPath, 'wb');
+                oOutFile = open(sPath, 'wb');                   # pylint: disable=consider-using-with
             except:
                 return reporter.errorXcpt('open(%s, "wb") failed' % (sPath,));

trunk/src/VBox/ValidationKit/testdriver/tst-txsclient.py ¶

@@ -38 +38 @@
 sys.path.insert(0, '.');
 sys.path.insert(0, '..');
-import testdriver.txsclient as txsclient
-import testdriver.reporter as reporter
-from common import utils;
+from common     import utils;
+from testdriver import txsclient;
+from testdriver import reporter;
 
 # Python 3 hacks:

trunk/src/VBox/ValidationKit/testdriver/vbox.py ¶

@@ -3795 +3795 @@
                 # resubmit the task.
                 cMsTimeout2 = msStart + cMsTimeout - base.timestampMilli();
-                if cMsTimeout2 < 500:
-                    cMsTimeout2 = 500;
+                cMsTimeout2 = max(cMsTimeout2, 500);
                 fRc = oTxsSession.asyncIsFile('${CDROM}/%s' % (sFile,), cMsTimeout2);
                 if fRc is not True:

trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py ¶

@@ -239 +239 @@
         sFull = self.__persistentVarCalcName(sVar);
         try:
-            oFile = open(sFull, 'w');
-            if sValue:
-                oFile.write(sValue.encode('utf-8'));
-            oFile.close();
+            with open(sFull, 'w') as oFile:
+                if sValue:
+                    oFile.write(sValue.encode('utf-8'));
         except:
             reporter.errorXcpt('Error creating "%s"' % (sFull,));
@@ -292 +291 @@
             return None;
         try:
-            oFile = open(sFull, 'r');
-            sValue = oFile.read().decode('utf-8');
-            oFile.close();
+            with open(sFull, 'r') as oFile:
+                sValue = oFile.read().decode('utf-8');
         except:
             reporter.errorXcpt('Error creating "%s"' % (sFull,));
@@ -492 +490 @@
         # Download the build files.
         #
-        for i in range(len(self._asBuildUrls)):
-            if webutils.downloadFile(self._asBuildUrls[i], self._asBuildFiles[i],
-                                     self.sBuildPath, reporter.log, reporter.log) is not True:
+        for i, sBuildUrl in enumerate(self._asBuildUrls):
+            if webutils.downloadFile(sBuildUrl, self._asBuildFiles[i], self.sBuildPath, reporter.log, reporter.log) is not True:
                 reporter.testDone(fSkipped = True);
                 return None; # Failed to get binaries, probably deleted. Skip the test run.

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py ¶

@@ -39 +39 @@
 
 # Validation Kit imports.
+from common     import pathutils;
+from common     import utils;
 from testdriver import base;
 from testdriver import reporter;
 from testdriver import vboxcon;
-from common import pathutils;
-from common import utils;
 
 

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py ¶

@@ -237 +237 @@
                 break;
             cMsToWait = cMsTimeout - cMsElapsed;
-            if cMsToWait > 500:
-                cMsToWait = 500;
+            cMsToWait = min(cMsToWait, 500);
             try:
                 self.o.waitForCompletion(cMsToWait);
@@ -699 +698 @@
                 break;
             cMsSleep = cMsTimeout - cMsElapsed;
-            if cMsSleep > 10000:
-                cMsSleep = 10000;
+            cMsSleep = min(cMsSleep, 10000);
             try:    self.oVBoxMgr.waitForEvents(cMsSleep);
             except KeyboardInterrupt: raise;
@@ -2856 +2854 @@
             return False
 
-        oFile = open(sFilename, 'wb')
-        oFile.write(aPngData)
-        oFile.close()
+        with open(sFilename, 'wb') as oFile:
+            oFile.write(aPngData)
 
         return True