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

Timestamp:

Feb 20, 2023 3:05:40 PM (2 years ago)

Author:

vboxsync

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

155955

Message:

ValKit: Pylint 2.16.2 adjustments.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

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

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

@@ -437 +437 @@
     def lockTask(self):
         """ Wrapper around oCv.acquire(). """
-        if True is True: # change to False for debugging deadlocks. # pylint: disable=comparison-with-itself
+        # Change this to False for debugging deadlocks.
+        if True is True: # pylint: disable=comparison-with-itself,comparison-of-constants
             self.oCv.acquire();
         else:
@@ -654 +655 @@
                     try:
                         if hasattr(self.hWin, '__int__'): # Needed for newer pywin32 versions.
-                            (uPid, uStatus) = os.waitpid(self.hWin.__int__(), 0);
+                            (uPid, uStatus) = os.waitpid(self.hWin.__int__(), 0); # pylint: disable=unnecessary-dunder-call
                         else:
                             (uPid, uStatus) = os.waitpid(self.hWin, 0);
@@ -1079 +1080 @@
         except:
             return None;
-        else:
-            oTask.setTaskOwner(None);
+        oTask.setTaskOwner(None);
         #reporter.log2('tasks left: %d - %s' % (len(self.aoTasks), self.aoTasks));
         return oTask;

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

@@ -484 +484 @@
         self.fnTask         = fnTask;
         self.aTaskArgs      = aArgs;
-        self.oThread        = threading.Thread(target=self.taskThread, args=(), name=('TXS-%s' % (sStatus)));
+        self.oThread        = threading.Thread(target=self.taskThread, args=(), name='TXS-%s' % (sStatus));
         self.oThread.setDaemon(True); # pylint: disable=deprecated-method
         self.msStart        = base.timestampMilli();
@@ -527 +527 @@
         if sys.version_info < (3, 9, 0):
             # Removed since Python 3.9.
-            return oThread.isAlive(); # pylint: disable=no-member
+            return oThread.isAlive(); # pylint: disable=no-member,deprecated-method
         return oThread.is_alive();
 
@@ -1189 +1189 @@
                 abBuf = array.array('B');
                 if utils.isString(sRaw):
-                    for i, _ in enumerate(sRaw):
-                        abBuf.append(ord(sRaw[i]));
+                    for ch in sRaw:
+                        abBuf.append(ord(ch));
                 else:
                     abBuf.extend(sRaw);

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

@@ -556 +556 @@
         Called when working in passive mode.
         """
-        self.oThread = threading.Thread(target = self.threadForPassiveMode, \
-            args=(), name=('PAS-%s' % (self.sName,)));
+        self.oThread = threading.Thread(target = self.threadForPassiveMode, args=(), name='PAS-%s' % (self.sName,) );
         self.oThread.setDaemon(True); # pylint: disable=deprecated-method
         self.oThread.start();
@@ -617 +616 @@
                 oRet = oVBoxMgr.createCallback(sICallbackNm, oSubClass, dArgsCopy);
             except:
-                reporter.errorXcpt('%s::registerCallback(%s) failed%s' % (sSrcParentNm, oRet, sLogSuffix));
+                reporter.errorXcpt('%s::createCallback(%s) failed%s' % (sSrcParentNm, sICallbackNm, sLogSuffix,));
             else:
                 try:
@@ -624 +623 @@
                 except Exception as oXcpt:
                     if fMustSucceed or ComError.notEqual(oXcpt, ComError.E_UNEXPECTED):
-                        reporter.errorXcpt('%s::registerCallback(%s)%s' % (sSrcParentNm, oRet, sLogSuffix));
+                        reporter.errorXcpt('%s::registerCallback(%s)%s' % (sSrcParentNm, oRet, sLogSuffix,));
         else:
             #
@@ -944 +943 @@
 
         # Try dev build first since that's where I'll be using it first...
-        if True is True: # pylint: disable=comparison-with-itself
+        if True is True: # pylint: disable=comparison-with-itself,comparison-of-constants
             try:
                 self.oBuild = Build(self, None);

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

@@ -361 +361 @@
             # Are any of the debugger processes hooked up to a VBox process?
             if sHostOs == 'windows':
-                # On demand debugging windows: windbg -p <decimal-pid> -e <decimal-event> -g
-                for oDebugger in aoDebuggers:
-                    for oProcess in aoTodo:
+                def isDebuggerDebuggingVBox(oDebugger, aoVBoxProcesses):
+                    for oProcess in aoVBoxProcesses:
                         # The whole command line is asArgs[0] here. Fix if that changes.
                         if oDebugger.asArgs and oDebugger.asArgs[0].find('-p %s ' % (oProcess.iPid,)) >= 0:
-                            aoTodo.append(oDebugger);
-                            break;
+                            return True;
+                    return False;
             else:
-                for oDebugger in aoDebuggers:
-                    for oProcess in aoTodo:
+                def isDebuggerDebuggingVBox(oDebugger, aoVBoxProcesses):
+                    for oProcess in aoVBoxProcesses:
                         # Simplistic approach: Just check for argument equaling our pid.
                         if oDebugger.asArgs and ('%s' % oProcess.iPid) in oDebugger.asArgs:
-                            aoTodo.append(oDebugger);
-                            break;
+                            return True;
+                    return False;
+            for oDebugger in aoDebuggers:
+                if isDebuggerDebuggingVBox(oDebugger, aoTodo):
+                    aoTodo.append(oDebugger);
 
             # Kill.
@@ -586 +588 @@
             fRc = fRc2;
 
-        reporter.testDone(fSkipped = (fRc is None));
+        reporter.testDone(fSkipped = fRc is None);
         return fRc;
 

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

@@ -1890 +1890 @@
                         cTests = cTests + (rc2 is not None);
                         if sParavirtMode is not None:
-                            reporter.testDone(fSkipped = (rc2 is None));
+                            reporter.testDone(fSkipped = rc2 is None);
 
                     reporter.testDone(fSkipped = cTests == cStartTests);

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

@@ -526 +526 @@
         they don't throw errors.
         """
-        if True is True: # pylint: disable=comparison-with-itself
+        if True is True: # pylint: disable=comparison-with-itself,comparison-of-constants
             try:
                 iPct        = self.o.operationPercent;
@@ -1837 +1837 @@
                     reporter.errorXcpt('addStorageController("%s",%s) failed on "%s"' % (sController, eBus, self.sName) );
                     return False;
-                else:
-                    try:
-                        oCtl.controllerType = eType;
-                        reporter.log('added storage controller "%s" (bus %s, type %s) to %s'
-                                    % (sController, eBus, eType, self.sName));
-                    except:
-                        reporter.errorXcpt('controllerType = %s on ("%s" / %s) failed on "%s"'
-                                           % (eType, sController, eBus, self.sName) );
-                        return False;
+                try:
+                    oCtl.controllerType = eType;
+                    reporter.log('added storage controller "%s" (bus %s, type %s) to %s'
+                                % (sController, eBus, eType, self.sName));
+                except:
+                    reporter.errorXcpt('controllerType = %s on ("%s" / %s) failed on "%s"'
+                                       % (eType, sController, eBus, self.sName) );
+                    return False;
         finally:
             self.oTstDrv.processPendingEvents();
@@ -2474 +2473 @@
             sValue = self.o.machine.getExtraData(sKey)
         except:
-            reporter.errorXcpt('IMachine::setExtraData("%s","%s") failed' % (sKey, sValue))
+            reporter.errorXcpt('IMachine::getExtraData("%s") failed' % (sKey,))
             return None
         return sValue
@@ -3289 +3288 @@
                 self._deregisterEventHandler();
                 raise;
-            else:
-                if sIpAddr is not None:
-                    self._setIp(sIpAddr);
+            if sIpAddr is not None:
+                self._setIp(sIpAddr);
 
             #

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

@@ -142 +142 @@
         reporter.logXcpt('uPid=%s oXcpt=%s' % (uPid, oXcpt));
     except Exception as oXcpt:
-        reporter.logXcpt('uPid=%s' % (uPid,));
+        reporter.logXcpt('uPid=%s oXcpt=%s' % (uPid, oXcpt));
         return False;
     else: