Changeset 97673 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Nov 24, 2022 11:46:15 AM (2 years ago)

Author:

vboxsync

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

154728

Message:

Validation Kit: Fixed lots of warnings, based on pylint 2.12.2.

Location:

trunk/src/VBox/ValidationKit/tests

Files:

• additions/tdAddBasic1.py (modified) (1 diff)
• additions/tdAddGuestCtrl.py (modified) (3 diffs)
• api/tdPython1.py (modified) (1 diff)
• autostart/tdAutostart1.py (modified) (1 diff)
• installation/tdGuestOsInstOs2.py (modified) (1 diff)
• installation/tdGuestOsUnattendedInst1.py (modified) (2 diffs)
• storage/tdStorageRawDrive1.py (modified) (4 diffs)
• unittests/tdUnitTest1.py (modified) (1 diff)
• usb/usbgadget.py (modified) (1 diff)

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

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

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

@@ -3353 +3353 @@
                                                          args = (oGuestProcess,),
                                                          name = ('threadForTestGuestCtrlSessionReboot'));
-                        oThreadReboot.setDaemon(True);
+                        oThreadReboot.setDaemon(True); # pylint: disable=deprecated-method
                         oThreadReboot.start();
 
@@ -4312 +4312 @@
                 oFile.setSize(64);
                 fUseFallback = False;
-            except Exception as oXcpt:
+            except:
                 reporter.logXcpt();
 
@@ -4323 +4323 @@
                     try:
                         oFile.setSize(cbBigFile);
-                    except Exception as oXcpt:
+                    except Exception:
                         reporter.logXcpt('cbBigFile=%s' % (sBigPath,));
                         try:

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

@@ -176 +176 @@
                 try:
                     oThread = threading.Thread(target=self.interruptWaitEventsThreadProc);
-                    oThread.setDaemon(False);
+                    oThread.setDaemon(False); # pylint: disable=deprecated-method
                 except:
                     reporter.errorXcpt();

trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py

@@ -1318 +1318 @@
         oSet.aoTestVms.extend([oTestVm for oTestVm in self.asTestVmClasses.values() if oTestVm is not None]);
         sOs = self.getBuildOs();
-        if sOs in self.asTestVmClasses.keys():
+        if sOs in self.asTestVmClasses:
             for oTestVM in oSet.aoTestVms:
                 if oTestVM is not None:

trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstOs2.py

@@ -206 +206 @@
 
         # Set extra data
-        if self.asExtraData != []:
+        if self.asExtraData:
             for sExtraData in self.asExtraData:
                 try:

trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsUnattendedInst1.py

@@ -269 +269 @@
             eNic0AttachType = vboxcon.NetworkAttachmentType_HostOnlyNetwork;
 
-        return vboxtestvms.BaseTestVm._createVmDoIt(self, oTestDrv, eNic0AttachType, sDvdImage);
+        return vboxtestvms.BaseTestVm._createVmDoIt(self, oTestDrv, eNic0AttachType, sDvdImage); # pylint: disable=protected-access
 
 
@@ -322 +322 @@
                 return True;
 
-        return vboxtestvms.BaseTestVm._skipVmTest(self, oTestDrv, oVM);
+        return vboxtestvms.BaseTestVm._skipVmTest(self, oTestDrv, oVM); # pylint: disable=protected-access
+
 
     def getReconfiguredVm(self, oTestDrv, cCpus, sVirtMode, sParavirtMode = None):

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

@@ -1086 +1086 @@
                     sKey = oMatch.group(1).strip();
                     sValue = oMatch.group(2).strip();
-                    if sKey not in asHeader.keys():
+                    if sKey not in asHeader:
                         return reporter.error("VMDK descriptor has invalid format");
                     sDictValue = asHeader[sKey];
@@ -1122 +1122 @@
                 sKey = oMatch.group(1).strip();
                 sValue = oMatch.group(2).strip();
-                if sKey not in asDatabase.keys():
+                if sKey not in asDatabase:
                     return reporter.error("VMDK descriptor has invalid format");
                 sDictValue = asDatabase[sKey];
@@ -1190 +1190 @@
                             reporter.error('Download vmdktest.vmdk from guest to host failed');
                         else:
-                            with open(sDstFile) as oFile:
+                            with open(sDstFile) as oFile: # pylint: disable=unspecified-encoding
                                 asDescriptor = [row.strip() for row in oFile];
                             if not asDescriptor:
@@ -1579 +1579 @@
         oSet.aoTestVms.extend([oTestVm for oTestVm in self.asTestVmClasses.values() if oTestVm is not None]);
         sOs = self.getBuildOs();
-        if sOs in self.asTestVmClasses.keys():
+        if sOs in self.asTestVmClasses:
             for oTestVM in oSet.aoTestVms:
                 if oTestVM is not None:

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

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

trunk/src/VBox/ValidationKit/tests/usb/usbgadget.py

@@ -563 +563 @@
         self.aTaskArgs      = aArgs;
         self.oThread        = threading.Thread(target=self.taskThread, args=(), name=('UTS-%s' % (sStatus)));
-        self.oThread.setDaemon(True);
+        self.oThread.setDaemon(True); # pylint: disable=deprecated-method
         self.msStart        = base.timestampMilli();