Changeset 94127 in vbox

Timestamp:

Mar 8, 2022 2:44:28 PM (3 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/ValidationKit/tests

Files:

• additions/tdAddBasic1.py (modified) (1 diff)
• additions/tdAddGuestCtrl.py (modified) (6 diffs)
• api/tdAppliance1.py (modified) (1 diff)
• api/tdMoveVm1.py (modified) (1 diff)
• serial/loopback.py (modified) (2 diffs)
• serial/tdSerial1.py (modified) (1 diff)
• storage/remoteexecutor.py (modified) (1 diff)
• unittests/tdUnitTest1.py (modified) (1 diff)
• usb/tst-utsgadget.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py

@@ -142 +142 @@
                           % (uuid.uuid4(), self.sVBoxValidationKitIso, sGaIso);
             reporter.log2('Using VISO combining ValKit and GAs "%s": %s' % (sVisoContent, sGaViso));
-            oGaViso = open(sGaViso, 'w');
-            oGaViso.write(sVisoContent);
-            oGaViso.close();
+            with open(sGaViso, 'w') as oGaViso:
+                oGaViso.write(sVisoContent);
             sGaIso = sGaViso;
 

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -151 +151 @@
         sHstFileName = os.path.join(oTstDrv.sScratchPath, sFileName);
         try:
-            oCurTestFile = open(sHstFileName, "wb");
-            oCurTestFile.write(aData);
-            oCurTestFile.close();
+            with open(sHstFileName, "wb") as oCurTestFile:
+                oCurTestFile.write(aData);
         except:
             return reporter.error('Unable to create temporary file for "%s"' % (sDesc,));
@@ -1772 +1771 @@
                 sDst = os.path.join(sDst, oTest.oSrc.sName);
             try:
-                oFile = open(sDst, 'rb');
+                oFile = open(sDst, 'rb');                       # pylint: disable=consider-using-with
             except:
                 return reporter.errorXcpt('open(%s) failed during verfication' % (sDst,));
@@ -1811 +1810 @@
                     sFilePath = os.path.join(sHostPath, oFsObj.sName);
                     try:
-                        oFile = open(sFilePath, 'rb');
+                        oFile = open(sFilePath, 'rb');          # pylint: disable=consider-using-with
                     except:
                         fRc = reporter.errorXcpt('open(%s) failed during verfication' % (sFilePath,));
@@ -4030 +4029 @@
             return (False, oTxsSession);
 
-        for sPath in self.oTestFiles.dPaths:
-            oFsObj = self.oTestFiles.dPaths[sPath];
+        for oFsObj in self.oTestFiles.dPaths.values():
             reporter.log2('testGuestCtrlFileStat: %s sPath=%s'
                           % ('file' if isinstance(oFsObj, testfileset.TestFile) else 'dir ', limitString(oFsObj.sPath),));
@@ -4696 +4694 @@
     def __generateFile(sName, cbFile):
         """ Helper for generating a file with a given size. """
-        oFile = open(sName, 'wb');
-        while cbFile > 0:
-            cb = cbFile if cbFile < 256*1024 else 256*1024;
-            oFile.write(bytearray(random.getrandbits(8) for _ in xrange(cb)));
-            cbFile -= cb;
-        oFile.close();
+        with open(sName, 'wb') as oFile:
+            while cbFile > 0:
+                cb = cbFile if cbFile < 256*1024 else 256*1024;
+                oFile.write(bytearray(random.getrandbits(8) for _ in xrange(cb)));
+                cbFile -= cb;
+        return True;
 
     def testGuestCtrlCopyTo(self, oSession, oTxsSession, oTestVm): # pylint: disable=too-many-locals
@@ -4770 +4768 @@
         sEmptyFileHst = os.path.join(self.oTstDrv.sScratchPath, 'gctrl-empty.data');
         try:
-            oFile = open(sEmptyFileHst, "wb");
-            oFile.close();
+            open(sEmptyFileHst, "wb").close();                  # pylint: disable=consider-using-with
         except:
             return reporter.errorXcpt('sEmptyFileHst=%s' % (sEmptyFileHst,));

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

@@ -161 +161 @@
         try:
             os.mkdir(sTmpDir, 0o755);
-            oTarFile = tarfile.open(sOva, 'r:*');
+            oTarFile = tarfile.open(sOva, 'r:*'); # No 'with' support in 2.6.   pylint: disable=consider-using-with
             oTarFile.extractall(sTmpDir);
             oTarFile.close();

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

@@ -397 +397 @@
         fRc = self.oTstDrv.terminateVmBySession(oSession)
 
-        if fRc is True or False:
+        if fRc is True:
             # Create a new Session object for moving VM.
             oSession = self.oTstDrv.openSession(oMachine)

trunk/src/VBox/ValidationKit/tests/serial/loopback.py

@@ -224 +224 @@
         Shutdown any connection and wait for it to become idle.
         """
-        self.oLock.acquire();
-        self.fShutdown = True;
-        self.oLock.release();
+        with self.oLock:
+            self.fShutdown = True;
         self.oIoPumper.shutdown();
 
@@ -233 +232 @@
         Returns whether the I/O pumping thread should shut down.
         """
-        self.oLock.acquire();
-        fShutdown = self.fShutdown;
-        self.oLock.release();
+        with self.oLock:
+            fShutdown = self.fShutdown;
 
         return fShutdown;

trunk/src/VBox/ValidationKit/tests/serial/tdSerial1.py

@@ -230 +230 @@
             cLast = 0;
             try:
-                oFile = open(self.sLocation, 'rb');
-                sFmt = '=I';
-                cBytes = 4;
-                for i in xrange(1048576 // 4):
-                    _ = i;
-                    sData = oFile.read(cBytes);
-                    tupUnpacked = struct.unpack(sFmt, sData);
-                    cLast = cLast + 1;
-                    if tupUnpacked[0] != cLast:
-                        reporter.testFailure('Corruption detected, expected counter value %s, got %s'
-                                             % (cLast + 1, tupUnpacked[0]));
-                        break;
-                oFile.close();
+                with open(self.sLocation, 'rb') as oFile:
+                    sFmt = '=I';
+                    cBytes = 4;
+                    for i in xrange(1048576 // 4):
+                        _ = i;
+                        sData = oFile.read(cBytes);
+                        tupUnpacked = struct.unpack(sFmt, sData);
+                        cLast = cLast + 1;
+                        if tupUnpacked[0] != cLast:
+                            reporter.testFailure('Corruption detected, expected counter value %s, got %s'
+                                                 % (cLast + 1, tupUnpacked[0],));
+                            break;
             except:
                 reporter.logXcpt();

trunk/src/VBox/ValidationKit/tests/storage/remoteexecutor.py

@@ -243 +243 @@
             sFileId = self.sScratchPath + '/' + sFilename;
             try:
-                oFile = open(sFileId, 'wb');
-                oFile.write(sContent);
-                oFile.close();
+                with open(sFileId, 'wb') as oFile:
+                    oFile.write(sContent);
             except:
                 sFileId = None;

trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py

@@ -1051 +1051 @@
         # Open /dev/null for use as stdin further down.
         try:
-            oDevNull = open(os.path.devnull, 'w+');
+            oDevNull = open(os.path.devnull, 'w+');             # pylint: disable=consider-using-with
         except:
             oDevNull = None;

trunk/src/VBox/ValidationKit/tests/usb/tst-utsgadget.py

@@ -36 +36 @@
 sys.path.insert(0, '..');
 sys.path.insert(0, '../..');
+from common import utils;
+from testdriver import reporter;
 import usbgadget;
-import testdriver.reporter as reporter
-from common import utils;