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

Timestamp:

Jun 11, 2019 11:58:28 AM (6 years ago)

Author:

vboxsync

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

131247

Message:

ValKit: New pylint version - cleanup in progress.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• base.py (modified) (12 diffs)
• btresolver.py (modified) (2 diffs)
• reporter.py (modified) (5 diffs)
• tst-txsclient.py (modified) (1 diff)
• txsclient.py (modified) (9 diffs)
• vbox.py (modified) (42 diffs)
• vboxcon.py (modified) (2 diffs)
• vboxinstaller.py (modified) (1 diff)
• vboxtestvms.py (modified) (7 diffs)
• vboxwrappers.py (modified) (11 diffs)
• winbase.py (modified) (1 diff)

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

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 # $Id$
-# pylint: disable=C0302
+# pylint: disable=too-many-lines
 
 """
@@ -222 +222 @@
         fRc = False;
     else:
-        fRc = __processSudoKill(uPid, signal.SIGUSR1, fSudo); # pylint: disable=E1101
+        fRc = __processSudoKill(uPid, signal.SIGUSR1, fSudo); # pylint: disable=no-member
     return fRc;
 
@@ -246 +246 @@
         fRc = winbase.processKill(uPid);
     else:
-        fRc = __processSudoKill(uPid, signal.SIGKILL, fSudo); # pylint: disable=E1101
+        fRc = __processSudoKill(uPid, signal.SIGKILL, fSudo); # pylint: disable=no-member
     return fRc;
 
@@ -307 +307 @@
 
             # ps fails with non-zero exit code if the pid wasn't found.
-            if iExitCode is not 0:
+            if iExitCode != 0:
                 return False;
             if sCurName is None:
@@ -380 +380 @@
     def __del__(self):
         """In case we need it later on."""
-        pass;
+        pass;   # pylint: disable=unnecessary-pass
 
     def toString(self):
@@ -395 +395 @@
     def lockTask(self):
         """ Wrapper around oCv.acquire(). """
-        if True is True: # change to False for debugging deadlocks.
+        if True is True: # change to False for debugging deadlocks. # pylint: disable=comparison-with-itself
             self.oCv.acquire();
         else:
@@ -600 +600 @@
                     try:
                         (uPid, uStatus) = os.waitpid(self.hWin, 0);
-                        if uPid == self.hWin or uPid == self.uPid:
+                        if uPid in (self.hWin, self.uPid,):
                             self.hWin.Detach(); # waitpid closed it, so it's now invalid.
                             self.hWin = None;
@@ -613 +613 @@
             else:
                 try:
-                    (uPid, uStatus) = os.waitpid(self.uPid, os.WNOHANG); # pylint: disable=E1101
+                    (uPid, uStatus) = os.waitpid(self.uPid, os.WNOHANG); # pylint: disable=no-member
                 except:
                     reporter.logXcpt();
@@ -773 +773 @@
 
 
-class TestDriverBase(object): # pylint: disable=R0902
+class TestDriverBase(object): # pylint: disable=too-many-instance-attributes
     """
     The base test driver.
@@ -1628 +1628 @@
 
 
-    def innerMain(self, asArgs = None): # pylint: disable=R0915
+    def innerMain(self, asArgs = None): # pylint: disable=too-many-statements
         """
         Exception wrapped main() worker.
@@ -1749 +1749 @@
 
 # The old, deprecated name.
-TestDriver = TestDriverBase; # pylint: disable=C0103
+TestDriver = TestDriverBase; # pylint: disable=invalid-name
 
 
@@ -1756 +1756 @@
 #
 
-# pylint: disable=C0111
+# pylint: disable=missing-docstring
 class TestDriverBaseTestCase(unittest.TestCase):
     def setUp(self):

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

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 # $Id$
-# pylint: disable=C0302
+# pylint: disable=too-many-lines
 
 """
@@ -548 +548 @@
                 self.oResolverOs = BacktraceResolverOsLinux(self.sScratchDbgPath, self.sScratchPath, self.fnLog);
             elif self.sTargetOs == 'darwin':
-                self.oResolverOs = BacktraceResolverOsDarwin(self.sScratchDbgPath, self.sScratchPath, self.fnLog); # pylint: disable=R0204
+                self.oResolverOs = BacktraceResolverOsDarwin(self.sScratchDbgPath, self.sScratchPath, self.fnLog); # pylint: disable=redefined-variable-type
             elif self.sTargetOs == 'solaris':
-                self.oResolverOs = BacktraceResolverOsSolaris(self.sScratchDbgPath, self.sScratchPath, self.fnLog); # pylint: disable=R0204
+                self.oResolverOs = BacktraceResolverOsSolaris(self.sScratchDbgPath, self.sScratchPath, self.fnLog); # pylint: disable=redefined-variable-type
             else:
                 self.log('The backtrace resolver is not supported on %s' % (self.sTargetOs,));

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

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 # $Id$
-# pylint: disable=C0302
+# pylint: disable=too-many-lines
 
 """
@@ -677 +677 @@
         if     sys.version_info[0] >= 3 \
            or (sys.version_info[0] == 2 and sys.version_info[1] >= 6):
-            if self._oParsedTmUrl.scheme == 'https': # pylint: disable=E1101
+            if self._oParsedTmUrl.scheme == 'https': # pylint: disable=no-member
                 self._fnTmConnect = lambda: httplib.HTTPSConnection(self._oParsedTmUrl.hostname,
                                                                     timeout = self.kcSecTestManagerRequestTimeout);
@@ -684 +684 @@
                                                                     timeout = self.kcSecTestManagerRequestTimeout);
         else:
-            if self._oParsedTmUrl.scheme == 'https': # pylint: disable=E1101
+            if self._oParsedTmUrl.scheme == 'https': # pylint: disable=no-member
                 self._fnTmConnect = lambda: httplib.HTTPSConnection(self._oParsedTmUrl.hostname);
             else:
@@ -704 +704 @@
         };
         self._sTmServerPath = '/%s/testboxdisp.py?%s' \
-                            % ( self._oParsedTmUrl.path.strip('/'), # pylint: disable=E1101
+                            % ( self._oParsedTmUrl.path.strip('/'), # pylint: disable=no-member
                                 self._fnUrlEncode(dParams), );
 
@@ -1687 +1687 @@
 
     cThread = 0;
-    for idThread, oStack in sys._current_frames().items(): # >=2.5, a bit ugly - pylint: disable=W0212
+    for idThread, oStack in sys._current_frames().items(): # >=2.5, a bit ugly - pylint: disable=protected-access
         try:
             if cThread > 0:

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

@@ -69 +69 @@
     return 'FAILED';
 
-def main(asArgs): # pylint: disable=C0111,R0914,R0915
+def main(asArgs): # pylint: disable=missing-docstring,too-many-locals,too-many-statements
     cMsTimeout      = long(30*1000);
     sAddress        = 'localhost';

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

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 # $Id$
-# pylint: disable=C0302
+# pylint: disable=too-many-lines
 
 """
@@ -719 +719 @@
     #
     # Process task
-    # pylint: disable=C0111
+    # pylint: disable=missing-docstring
     #
 
-    def taskExecEx(self, sExecName, fFlags, asArgs, asAddEnv, oStdIn, oStdOut, oStdErr, oTestPipe, sAsUser): # pylint: disable=R0913,R0914,R0915,C0301
+    def taskExecEx(self, sExecName, fFlags, asArgs, asAddEnv, oStdIn, oStdOut, oStdErr, oTestPipe, sAsUser): # pylint: disable=too-many-arguments,too-many-locals,too-many-statements,line-too-long
         # Construct the payload.
         aoPayload = [long(fFlags), '%s' % (sExecName), long(len(asArgs))];
@@ -918 +918 @@
         for o in (oStdIn, oStdOut, oStdErr, oTestPipe):
             if o is not None and not utils.isString(o):
-                del o.uTxsClientCrc32;      # pylint: disable=E1103
+                del o.uTxsClientCrc32;      # pylint: disable=maybe-no-member
                 # Make sure all files are closed
-                o.close();                  # pylint: disable=E1103
+                o.close();                  # pylint: disable=maybe-no-member
         reporter.log('taskExecEx: returns %s' % (rc));
         return rc;
@@ -1051 +1051 @@
     def taskUploadString(self, sContent, sRemoteFile):
         # Wrap sContent in a file like class.
-        class InStringFile(object): # pylint: disable=R0903
+        class InStringFile(object): # pylint: disable=too-few-public-methods
             def __init__(self, sContent):
                 self.sContent = sContent;
@@ -1148 +1148 @@
     def taskDownloadString(self, sRemoteFile, sEncoding = 'utf-8', fIgnoreEncodingErrors = True):
         # Wrap sContent in a file like class.
-        class OutStringFile(object): # pylint: disable=R0903
+        class OutStringFile(object): # pylint: disable=too-few-public-methods
             def __init__(self):
                 self.asContent = [];
@@ -1232 +1232 @@
         return rc;
 
-    # pylint: enable=C0111
+    # pylint: enable=missing-docstring
 
 
@@ -1310 +1310 @@
     #
 
-    def asyncExecEx(self, sExecName, asArgs = (), asAddEnv = (), # pylint: disable=R0913
+    def asyncExecEx(self, sExecName, asArgs = (), asAddEnv = (), # pylint: disable=too-many-arguments
                     oStdIn = None, oStdOut = None, oStdErr = None, oTestPipe = None,
                     sAsUser = "", cMsTimeout = 3600000, fIgnoreErrors = False):
@@ -1339 +1339 @@
                                oStdOut, oStdErr, oTestPipe, sAsUser));
 
-    def syncExecEx(self, sExecName, asArgs = (), asAddEnv = (), # pylint: disable=R0913
+    def syncExecEx(self, sExecName, asArgs = (), asAddEnv = (), # pylint: disable=too-many-arguments
                    oStdIn = '/dev/null', oStdOut = '/dev/null',
                    oStdErr = '/dev/null', oTestPipe = '/dev/null',
@@ -1895 +1895 @@
         oWakeupW = None;
         if hasattr(socket, 'socketpair'):
-            try:    (oWakeupR, oWakeupW) = socket.socketpair();         # pylint: disable=E1101
+            try:    (oWakeupR, oWakeupW) = socket.socketpair();         # pylint: disable=no-member
             except: reporter.logXcpt('socket.socketpair() failed');
 

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

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 # $Id$
-# pylint: disable=C0302
+# pylint: disable=too-many-lines
 
 """
@@ -68 +68 @@
 #
 
-ComException = None;                                                            # pylint: disable=C0103
-__fnComExceptionGetAttr__ = None;                                               # pylint: disable=C0103
+ComException = None;                                                            # pylint: disable=invalid-name
+__fnComExceptionGetAttr__ = None;                                               # pylint: disable=invalid-name
 
 def __MyDefaultGetAttr(oSelf, sName):
@@ -110 +110 @@
     exceptions and errors.
     """
-    global ComException                                                         # pylint: disable=C0103
-    global __fnComExceptionGetAttr__                                            # pylint: disable=C0103
+    global ComException                                                         # pylint: disable=invalid-name
+    global __fnComExceptionGetAttr__                                            # pylint: disable=invalid-name
 
     # Hook up our attribute getter for the exception class (ASSUMES new-style).
@@ -210 +210 @@
 
     # Reverse lookup table.
-    dDecimalToConst = {}; # pylint: disable=C0103
+    dDecimalToConst = {}; # pylint: disable=invalid-name
 
     def __init__(self):
@@ -329 +329 @@
 
 
-class Build(object): # pylint: disable=R0903
+class Build(object): # pylint: disable=too-few-public-methods
     """
     A VirtualBox build.
@@ -372 +372 @@
             sSearch = os.environ.get('VBOX_TD_DEV_TREE', os.path.dirname(__file__)); # Env.var. for older trees or testboxscript.
             sCandidat = None;
-            for i in range(0, 10):                                          # pylint: disable=W0612
+            for i in range(0, 10):                                          # pylint: disable=unused-variable
                 sBldDir = os.path.join(sSearch, sOut);
                 if os.path.isdir(sBldDir):
@@ -453 +453 @@
         self.oEventSrc  = dArgs['oEventSrc']; # Console/VirtualBox for < 3.3
         self.oListener  = dArgs['oListener'];
-        self.fPassive   = self.oListener != None;
+        self.fPassive   = self.oListener is not None;
         self.sName      = sName
         self.fShutdown  = False;
@@ -616 +616 @@
 
 
-    # pylint: disable=C0111,R0913,W0613
+    # pylint: disable=missing-docstring,too-many-arguments,unused-argument
     def onMousePointerShapeChange(self, fVisible, fAlpha, xHot, yHot, cx, cy, abShape):
         reporter.log2('onMousePointerShapeChange/%s' % (self.sName));
@@ -657 +657 @@
         reporter.log2('onShowWindow/%s' % (self.sName));
         return None;
-    # pylint: enable=C0111,R0913,W0613
+    # pylint: enable=missing-docstring,too-many-arguments,unused-argument
 
     def handleEvent(self, oEvt):
@@ -698 +698 @@
         EventHandlerBase.__init__(self, dArgs, self.oVBox.fpApiVer, sName);
 
-    # pylint: disable=C0111,W0613
+    # pylint: disable=missing-docstring,unused-argument
     def onMachineStateChange(self, sMachineId, eState):
         pass;
@@ -724 +724 @@
     def onGuestPropertyChange(self, sMachineId, sName, sValue, sFlags):
         pass;
-    # pylint: enable=C0111,W0613
+    # pylint: enable=missing-docstring,unused-argument
 
     def handleEvent(self, oEvt):
@@ -763 +763 @@
         ConsoleEventHandlerBase.__init__(self, dArgs);
 
-    def onMachineStateChange(self, sMachineId, eState):                         # pylint: disable=W0613
+    def onMachineStateChange(self, sMachineId, eState):                         # pylint: disable=unused-argument
         """ Just interrupt the wait loop here so it can check again. """
         _ = sMachineId; _ = eState;
@@ -782 +782 @@
 
 
-class TestDriver(base.TestDriver):                                              # pylint: disable=R0902
+class TestDriver(base.TestDriver):                                              # pylint: disable=too-many-instance-attributes
     """
     This is the VirtualBox test driver.
@@ -846 +846 @@
 
         # Try dev build first since that's where I'll be using it first...
-        if True is True:
+        if True is True: # pylint: disable=comparison-with-itself
             try:
                 self.oBuild = Build(self, None);
@@ -1008 +1008 @@
         return self.fImportedVBoxApi;
 
-    def _startVBoxSVC(self): # pylint: disable=R0915
+    def _startVBoxSVC(self): # pylint: disable=too-many-statements
         """ Starts VBoxSVC. """
         assert(self.oVBoxSvcProcess is None);
@@ -1058 +1058 @@
                 sWinDbg = 'c:\\Program Files\\Debugging Tools for Windows\\windbg.exe';
                 if not os.path.isfile(sWinDbg): sWinDbg = 'c:\\Program Files\\Debugging Tools for Windows (x64)\\windbg.exe';
-                if not os.path.isfile(sWinDbg): sWinDbg = 'c:\\Programme\\Debugging Tools for Windows\\windbg.exe'; # Localization rulez!  pylint: disable=C0301
+                if not os.path.isfile(sWinDbg): sWinDbg = 'c:\\Programme\\Debugging Tools for Windows\\windbg.exe'; # Localization rulez!  pylint: disable=line-too-long
                 if not os.path.isfile(sWinDbg): sWinDbg = 'c:\\Programme\\Debugging Tools for Windows (x64)\\windbg.exe';
                 if not os.path.isfile(sWinDbg): sWinDbg = 'windbg'; # WinDbg must be in the path; better than nothing.
@@ -1087 +1087 @@
                 self.oVBoxSvcProcess = base.Process.spawn(sVBoxSVC, sVBoxSVC, '--auto-shutdown'); # SIGUSR1 requirement.
                 try: # Try make sure we get the SIGINT and not VBoxSVC.
-                    os.setpgid(self.oVBoxSvcProcess.getPid(), 0); # pylint: disable=E1101
-                    os.setpgid(0, 0);                             # pylint: disable=E1101
+                    os.setpgid(self.oVBoxSvcProcess.getPid(), 0); # pylint: disable=no-member
+                    os.setpgid(0, 0);                             # pylint: disable=no-member
                 except:
                     reporter.logXcpt();
@@ -1129 +1129 @@
         # Fudge and pid file.
         #
-        if self.oVBoxSvcProcess != None and not self.oVBoxSvcProcess.wait(cMsFudge):
+        if self.oVBoxSvcProcess is not None and not self.oVBoxSvcProcess.wait(cMsFudge):
             if fWritePidFile:
                 iPid = self.oVBoxSvcProcess.getPid();
@@ -1149 +1149 @@
             except: pass;
 
-        return self.oVBoxSvcProcess != None;
+        return self.oVBoxSvcProcess is not None;
 
 
@@ -1261 +1261 @@
 
         try:
-            from vboxapi import VirtualBoxManager # pylint: disable=import-error
+            from vboxapi import VirtualBoxManager;  # pylint: disable=import-error
         except:
             reporter.logXcpt('Error importing vboxapi');
@@ -1270 +1270 @@
             # pylint: disable=import-error
             if self.sHost == 'win':
-                from pythoncom import com_error as NativeComExceptionClass  # pylint: disable=E0611
+                from pythoncom import com_error as NativeComExceptionClass  # pylint: disable=no-name-in-module
                 import winerror                 as NativeComErrorClass
             else:
@@ -1392 +1392 @@
             if oXcpt is None: oXcpt = sys.exc_info()[1];
             if sys.platform == 'win32':
-                from pythoncom import com_error as NativeComExceptionClass  # pylint: disable=import-error,E0611
+                from pythoncom import com_error as NativeComExceptionClass  # pylint: disable=import-error,no-name-in-module
             else:
                 from xpcom import Exception     as NativeComExceptionClass  # pylint: disable=import-error
@@ -1400 +1400 @@
             """ See vboxapi. """
             hrXcpt = oSelf.xcptGetResult(oXcpt);
-            return hrXcpt == hrStatus or hrXcpt == hrStatus - 0x100000000;
+            return hrXcpt == hrStatus or hrXcpt == hrStatus - 0x100000000;  # pylint: disable=consider-using-in
 
         def _xcptToString(oSelf, oXcpt):
@@ -1478 +1478 @@
                 # Also, it keeps a number of internal objects and interfaces around to do its job, so shutting
                 # it down before we go looking for dangling interfaces is more or less required.
-                from xpcom import _xpcom as _xpcom;             # pylint: disable=import-error
+                from xpcom import _xpcom as _xpcom;             # pylint: disable=import-error,useless-import-alias
                 hrc   = _xpcom.DeinitCOM();
-                cIfs  = _xpcom._GetInterfaceCount();            # pylint: disable=W0212
-                cObjs = _xpcom._GetGatewayCount();              # pylint: disable=W0212
+                cIfs  = _xpcom._GetInterfaceCount();            # pylint: disable=protected-access
+                cObjs = _xpcom._GetGatewayCount();              # pylint: disable=protected-access
 
                 if cObjs == 0 and cIfs == 0:
@@ -1489 +1489 @@
                                  % (cObjs, cIfs, hrc));
                     if hasattr(_xpcom, '_DumpInterfaces'):
-                        try:    _xpcom._DumpInterfaces();       # pylint: disable=W0212
+                        try:    _xpcom._DumpInterfaces();       # pylint: disable=protected-access
                         except: reporter.logXcpt('_teardownVBoxApi: _DumpInterfaces failed');
 
@@ -1666 +1666 @@
         return rc;
 
-    def parseOption(self, asArgs, iArg): # pylint: disable=R0915
+    def parseOption(self, asArgs, iArg): # pylint: disable=too-many-statements
         if asArgs[iArg] == '--vbox-session-type':
             iArg += 1;
@@ -1945 +1945 @@
         return None;
 
-    def _logVmInfoUnsafe(self, oVM):                                            # pylint: disable=R0915,R0912
+    def _logVmInfoUnsafe(self, oVM):                                            # pylint: disable=too-many-statements,too-many-branches
         """
         Internal worker for logVmInfo that is wrapped in try/except.
@@ -2153 +2153 @@
         return True;
 
-    def logVmInfo(self, oVM):                                                   # pylint: disable=R0915,R0912
+    def logVmInfo(self, oVM):                                                   # pylint: disable=too-many-statements,too-many-branches
         """
         Logs VM configuration details.
@@ -2194 +2194 @@
                     reporter.logXcpt();
                 else:
-                    if sIdOrDesc == sId or sIdOrDesc == sDesc:
+                    if sIdOrDesc in (sId, sDesc,):
                         sIdOrDesc = sId;
                         break;
@@ -2239 +2239 @@
                     return oVM;
                 except:
+                    reporter.logXcpt();
                     raise;
             except:
@@ -2259 +2260 @@
         return None;
 
-    # pylint: disable=R0913,R0914,R0915
+    # pylint: disable=too-many-arguments,too-many-locals,too-many-statements
     def createTestVM(self,
                      sName,
@@ -2375 +2376 @@
         self.logVmInfo(oVM); # testing...
         return oVM;
-    # pylint: enable=R0913,R0914,R0915
+    # pylint: enable=too-many-arguments,too-many-locals,too-many-statements
 
     def createTestVmWithDefaults(self,                                      # pylint: disable=too-many-arguments
@@ -2609 +2610 @@
           and sCurName != '' \
           and base.timestampMilli() - msStart < cMsTimeout \
-          and (   eCurState == vboxcon.SessionState_Unlocking \
-               or eCurState == vboxcon.SessionState_Spawning \
-               or eCurState == vboxcon.SessionState_Locked):
+          and eCurState in (vboxcon.SessionState_Unlocking, vboxcon.SessionState_Spawning, vboxcon.SessionState_Locked,):
             self.processEvents(1000);
             try:
@@ -2662 +2661 @@
         return fRc;
 
-    def startVmEx(self, oVM, fWait = True, sType = None, sName = None, asEnv = None): # pylint: disable=R0914,R0915
+    def startVmEx(self, oVM, fWait = True, sType = None, sName = None, asEnv = None): # pylint: disable=too-many-locals,too-many-statements
         """
         Start the VM, returning the VM session and progress object on success.
@@ -2758 +2757 @@
                     if   self.fpApiVer < 4.3 \
                       or (self.fpApiVer == 4.3 and not hasattr(self.oVBoxMgr, 'getSessionObject')):
-                        oSession = self.oVBoxMgr.mgr.getSessionObject(self.oVBox);  # pylint: disable=E1101
+                        oSession = self.oVBoxMgr.mgr.getSessionObject(self.oVBox);  # pylint: disable=no-member
                     elif self.fpApiVer < 5.2 \
                       or (self.fpApiVer == 5.2 and hasattr(self.oVBoxMgr, 'vbox')):
-                        oSession = self.oVBoxMgr.getSessionObject(self.oVBox);      # pylint: disable=E1101
+                        oSession = self.oVBoxMgr.getSessionObject(self.oVBox);      # pylint: disable=no-member
                     else:
-                        oSession = self.oVBoxMgr.getSessionObject();                # pylint: disable=E1101,E1120
+                        oSession = self.oVBoxMgr.getSessionObject();           # pylint: disable=no-member,no-value-for-parameter
                     if self.fpApiVer < 3.3:
                         oProgress = self.oVBox.openRemoteSession(oSession, sUuid, sType, sEnv);
@@ -2775 +2774 @@
                     oSession = None;
                     if i >= 0:
-                        reporter.logXcpt('warning: failed to start VM "%s" ("%s") - retrying in %u secs.' % (sUuid, oVM, i));     # pylint: disable=C0301
+                        reporter.logXcpt('warning: failed to start VM "%s" ("%s") - retrying in %u secs.' % (sUuid, oVM, i));     # pylint: disable=line-too-long
                 self.waitOnDirectSessionClose(oVM, 5000 + i * 1000);
         if fWait and oProgress is not None:
@@ -2842 +2841 @@
         return oSession;
 
-    def terminateVmBySession(self, oSession, oProgress = None, fTakeScreenshot = None): # pylint: disable=R0915
+    def terminateVmBySession(self, oSession, oProgress = None, fTakeScreenshot = None): # pylint: disable=too-many-statements
         """
         Terminates the VM specified by oSession and adds the release logs to
@@ -3291 +3290 @@
         fRemoveTxs = self.addTask(oTxsSession);
 
-        rc = fnAsync(*aArgs); # pylint: disable=W0142
+        rc = fnAsync(*aArgs); # pylint: disable=star-args
         if rc is True:
             rc = False;
@@ -3325 +3324 @@
         return rc;
 
-    # pylint: disable=C0111
+    # pylint: disable=missing-docstring
 
     def txsDisconnect(self, oSession, oTxsSession, cMsTimeout = 30000, fIgnoreErrors = False):
@@ -3424 +3423 @@
                               (sRemoteFile, sRemoteDir, self.adjustTimeoutMs(cMsTimeout), fIgnoreErrors));
 
-    # pylint: enable=C0111
+    # pylint: enable=missing-docstring
 
     def txsCdWait(self,
@@ -3652 +3651 @@
         return (fRc, oTxsSession);
 
-    # pylint: disable=R0914,R0913
+    # pylint: disable=too-many-locals,too-many-arguments
 
     def txsRunTest(self, oTxsSession, sTestName, cMsTimeout, sExecName, asArgs = (), asAddEnv = (), sAsUser = ""):
@@ -3810 +3809 @@
         return fRc;
 
-    # pylint: enable=R0914,R0913
+    # pylint: enable=too-many-locals,too-many-arguments
 
 

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

@@ -36 +36 @@
 
 
-class VBoxConstantWrappingHack(object):                                         # pylint: disable=R0903
+class VBoxConstantWrappingHack(object):                                         # pylint: disable=too-few-public-methods
     """
     This is a hack to avoid the self.oVBoxMgr.constants.MachineState_Running
@@ -80 +80 @@
 
 
-goHackModuleClass = VBoxConstantWrappingHack(sys.modules[__name__]);                         # pylint: disable=C0103
+goHackModuleClass = VBoxConstantWrappingHack(sys.modules[__name__]);                         # pylint: disable=invalid-name
 sys.modules[__name__] = goHackModuleClass;
 

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

@@ -837 +837 @@
         """
 
-        import win32com.client; # pylint: disable=F0401
+        import win32com.client; # pylint: disable=import-error
         win32com.client.gencache.EnsureModule('{000C1092-0000-0000-C000-000000000046}', 1033, 1, 0);
         oInstaller = win32com.client.Dispatch('WindowsInstaller.Installer',

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

@@ -71 +71 @@
 ## @name Flags.
 ## @{
-g_k32           = 32;                   # pylint: disable=C0103
-g_k64           = 64;                   # pylint: disable=C0103
-g_k32_64        = 96;                   # pylint: disable=C0103
+g_k32           = 32;                   # pylint: disable=invalid-name
+g_k64           = 64;                   # pylint: disable=invalid-name
+g_k32_64        = 96;                   # pylint: disable=invalid-name
 g_kiArchMask    = 96;
 g_kiNoRaw       = 128;                  ##< No raw mode.
@@ -87 +87 @@
 
 # Table translating from VM name core to a more detailed guest info.
-# pylint: disable=C0301
+# pylint: disable=line-too-long
 ## @todo what's the difference between the first two columns again?
 g_aaNameToDetails = \
@@ -179 +179 @@
 
 
-# pylint: enable=C0301
+# pylint: enable=line-too-long
 
 def _intersects(asSet1, asSet2):
@@ -199 +199 @@
     """
 
-    def __init__(self, # pylint: disable=R0913
+    def __init__(self, # pylint: disable=too-many-arguments
                  sVmName,                                   # type: str
                  fGrouping = 0,                             # type: int
@@ -904 +904 @@
     """
 
-    def __init__(self, # pylint: disable=R0913
+    def __init__(self, # pylint: disable=too-many-arguments
                  sVmName,                                   # type: str
                  fGrouping = 0,                             # type: int
@@ -1395 +1395 @@
 
 
-    def __init__(self, # pylint: disable=R0913
+    def __init__(self, # pylint: disable=too-many-arguments
                  sVmName,                                   # type: str
                  fGrouping = g_kfGrpAncient | g_kfGrpNoTxs, # type: int
@@ -1703 +1703 @@
         return True;
 
-    def actionExecute(self, oTestDrv, fnCallback): # pylint: disable=R0914
+    def actionExecute(self, oTestDrv, fnCallback): # pylint: disable=too-many-locals
         """
         For base.TestDriver.actionExecute.  Calls the callback function for

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

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 # $Id$
-# pylint: disable=C0302
+# pylint: disable=too-many-lines
 
 """
@@ -102 +102 @@
 
 
-class VirtualBoxWrapper(object): # pylint: disable=R0903
+class VirtualBoxWrapper(object): # pylint: disable=too-few-public-methods
     """
     Wrapper around the IVirtualBox object that adds some (hopefully) useful
@@ -509 +509 @@
         they don't throw errors.
         """
-        if True is True:
+        if True is True: # pylint: disable=comparison-with-itself
             try:
                 iPct        = self.o.operationPercent;
@@ -1280 +1280 @@
         Helper that translate the adapter type into a driver name.
         """
-        if    eNicType == vboxcon.NetworkAdapterType_Am79C970A \
-           or eNicType == vboxcon.NetworkAdapterType_Am79C973:
+        if eNicType in (vboxcon.NetworkAdapterType_Am79C970A, vboxcon.NetworkAdapterType_Am79C973):
             sName = 'pcnet';
-        elif    eNicType == vboxcon.NetworkAdapterType_I82540EM \
-             or eNicType == vboxcon.NetworkAdapterType_I82543GC \
-             or eNicType == vboxcon.NetworkAdapterType_I82545EM:
+        elif eNicType in (vboxcon.NetworkAdapterType_I82540EM,
+                          vboxcon.NetworkAdapterType_I82543GC,
+                          vboxcon.NetworkAdapterType_I82545EM):
             sName = 'e1000';
         elif eNicType == vboxcon.NetworkAdapterType_Virtio:
@@ -1562 +1561 @@
         # Resolve missing MAC address prefix by feeding in the host IP address bytes.
         cchMacAddr = len(sMacAddr);
-        if cchMacAddr > 0 and cchMacAddr < 12:
+        if 0 < cchMacAddr < 12:
             sHostIP = netutils.getPrimaryHostIp();
             abHostIP = socket.inet_aton(sHostIP);
@@ -1925 +1924 @@
         return oHd;
 
-    def createAndAttachHd(self, sHd, sFmt = "VDI", sController = "IDE Controller", cb = 10*1024*1024*1024, # pylint: disable=R0913
+    def createAndAttachHd(self, sHd, sFmt = "VDI", sController = "IDE Controller", cb = 10*1024*1024*1024, # pylint: disable=too-many-arguments
                           iPort = 0, iDevice = 0, fImmutable = True, cMsTimeout = 60000, tMediumVariant = None):
         """
@@ -2115 +2114 @@
         return True;
 
-    def setupPreferredConfig(self):                                             # pylint: disable=R0914
+    def setupPreferredConfig(self):                                             # pylint: disable=too-many-locals
         """
         Configures the VM according to the preferences of the guest type.
@@ -2180 +2179 @@
             if not self.enableUsbHid(fUsbHid):          fRc = False;
             if not self.enableHpet(fHpet):              fRc = False;
-        if  eStorCtlType == vboxcon.StorageControllerType_PIIX3 \
-         or eStorCtlType == vboxcon.StorageControllerType_PIIX4 \
-         or eStorCtlType == vboxcon.StorageControllerType_ICH6:
+        if eStorCtlType in (vboxcon.StorageControllerType_PIIX3,
+                            vboxcon.StorageControllerType_PIIX4,
+                            vboxcon.StorageControllerType_ICH6,):
             if not self.setStorageControllerType(eStorCtlType, "IDE Controller"):
                 fRc = False;
@@ -2190 +2189 @@
         return fRc;
 
-    def addUsbDeviceFilter(self, sName, sVendorId = None, sProductId = None, sRevision = None, # pylint: disable=R0913
+    def addUsbDeviceFilter(self, sName, sVendorId = None, sProductId = None, sRevision = None, # pylint: disable=too-many-arguments
                            sManufacturer = None, sProduct = None, sSerialNumber = None,
                            sPort = None, sRemote = None):
@@ -3033 +3032 @@
         """ Class for looking for IPv4 address changes on interface 0."""
         def __init__(self, dArgs):
-            vbox.VirtualBoxEventHandlerBase.__init__(self, dArgs);              # pylint: disable=W0233
+            vbox.VirtualBoxEventHandlerBase.__init__(self, dArgs);
             self.oParentTask = dArgs['oParentTask'];
             self.sMachineId  = dArgs['sMachineId'];
@@ -3044 +3043 @@
                 oParentTask = self.oParentTask;
                 if oParentTask:
-                    oParentTask._setIp(sValue);                                # pylint: disable=W0212
+                    oParentTask._setIp(sValue);                                # pylint: disable=protected-access
 
 

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

@@ -143 +143 @@
     if fRc is True:
         try:
-            from win32com.client import GetObject; # pylint: disable=F0401
+            from win32com.client import GetObject; # pylint: disable=import-error
             oWmi = GetObject('winmgmts:');
             aoProcesses = oWmi.InstancesOf('Win32_Process');