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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• base.py (modified) (6 diffs)
• txsclient.py (modified) (1 diff)
• vbox.py (modified) (2 diffs)
• vboxinstaller.py (modified) (2 diffs)
• vboxtestvms.py (modified) (1 diff)
• vboxwrappers.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testdriver/base.py

@@ -82 +82 @@
     Returns the executable suffix.
     """
-    if os.name == 'nt' or os.name == 'os2':
+    if os.name in ('nt', 'os2'):
         return '.exe';
     return '';
@@ -484 +484 @@
             reporter.log2('signalTaskLocked(%s)' % (self,));
         self.fSignalled = True;
-        self.oCv.notifyAll()
+        self.oCv.notifyAll(); # pylint: disable=deprecated-method
         if self.oOwner is not None:
             self.oOwner.notifyAboutReadyTask(self);
@@ -1431 +1431 @@
             self.asActions.append(asArgs[iArg])
         elif asArgs[iArg] in self.asSpecialActions:
-            if self.asActions != []:
+            if self.asActions:
                 raise InvalidOption('selected special action "%s" already' % (self.asActions[0], ));
             self.asActions = [ asArgs[iArg] ];
@@ -1705 +1705 @@
                         raise InvalidOption('unknown option: %s' % (asArgs[iArg]))
                 iArg = iNext;
-        except QuietInvalidOption as oXcpt:
+        except QuietInvalidOption:
             return rtexitcode.RTEXITCODE_SYNTAX;
         except InvalidOption as oXcpt:
@@ -1718 +1718 @@
             return rtexitcode.RTEXITCODE_SYNTAX;
 
-        if self.asActions == []:
+        if not self.asActions:
             reporter.error('no action was specified');
             reporter.error('valid actions: %s' % (self.asNormalActions + self.asSpecialActions + ['all']));
@@ -1790 +1790 @@
             self.pidFileRemove(os.getpid());
 
-        if asActions != [] and fRc is True:
+        if asActions and fRc is True:
             reporter.error('unhandled actions: %s' % (asActions,));
             fRc = False;

trunk/src/VBox/ValidationKit/testdriver/txsclient.py

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

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

@@ -558 +558 @@
         self.oThread = threading.Thread(target = self.threadForPassiveMode, \
             args=(), name=('PAS-%s' % (self.sName,)));
-        self.oThread.setDaemon(True)
+        self.oThread.setDaemon(True); # pylint: disable=deprecated-method
         self.oThread.start();
         return None;
@@ -1981 +1981 @@
         """
         sAdpName = '';
-        if    oNic.adapterType == vboxcon.NetworkAdapterType_Am79C970A \
-            or oNic.adapterType == vboxcon.NetworkAdapterType_Am79C973 \
-            or oNic.adapterType == vboxcon.NetworkAdapterType_Am79C960:
+        if    oNic.adapterType in (vboxcon.NetworkAdapterType_Am79C970A, \
+                                   vboxcon.NetworkAdapterType_Am79C973, \
+                                   vboxcon.NetworkAdapterType_Am79C960):
             sAdpName = 'pcnet';
-        elif    oNic.adapterType == vboxcon.NetworkAdapterType_I82540EM \
-            or oNic.adapterType == vboxcon.NetworkAdapterType_I82543GC \
-            or oNic.adapterType == vboxcon.NetworkAdapterType_I82545EM:
+        elif    oNic.adapterType in (vboxcon.NetworkAdapterType_I82540EM, \
+                                     vboxcon.NetworkAdapterType_I82543GC, \
+                                     vboxcon.NetworkAdapterType_I82545EM):
             sAdpName = 'e1000';
         elif oNic.adapterType == vboxcon.NetworkAdapterType_Virtio:

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

@@ -266 +266 @@
         sFull = self.__persistentVarCalcName(sVar);
         try:
-            with open(sFull, 'w') as oFile:
+            with open(sFull, 'w') as oFile: # pylint: disable=unspecified-encoding
                 if sValue:
                     oFile.write(sValue.encode('utf-8'));
@@ -318 +318 @@
             return None;
         try:
-            with open(sFull, 'r') as oFile:
+            with open(sFull, 'r') as oFile: # pylint: disable=unspecified-encoding
                 sValue = oFile.read().decode('utf-8');
         except:

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

@@ -1554 +1554 @@
 
         for oTestVm in self.aoTestVms:
-            if oTestVm.sVmName == sVmName or oTestVm.sVmName == sAltName:
+            if oTestVm.sVmName in (sVmName, sAltName):
                 return oTestVm;
         return None;

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

@@ -155 +155 @@
         The new instance is returned on success.  None is returned on error.
         """
-        dArgsCopy = dArgs.copy() if dArgs is not None else dict();
+        dArgsCopy = dArgs.copy() if dArgs is not None else {};
         dArgsCopy['oVBox'] = self;
         return oSubClass.registerDerivedEventHandler(self.oVBoxMgr, self.fpApiVer, oSubClass, dArgsCopy,
@@ -2868 +2868 @@
             return False
 
-        with open(sFilename, 'wb') as oFile:
+        with open(sFilename, 'wb') as oFile: # pylint: disable=unspecified-encoding
             oFile.write(aPngData)
 
@@ -3103 +3103 @@
 
         # Add the base class arguments.
-        dArgsCopy = dArgs.copy() if dArgs is not None else dict();
+        dArgsCopy = dArgs.copy() if dArgs is not None else {};
         dArgsCopy['oSession'] = self;
         dArgsCopy['oConsole'] = oConsole;