Changeset 84921 in vbox

Timestamp:

Jun 23, 2020 8:30:13 PM (5 years ago)

Author:

vboxsync

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

138793

Message:

ValKit: pylint 2.5.3 adjustments.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/reporter.py (modified) (3 diffs)
• testdriver/txsclient.py (modified) (2 diffs)
• testmanager/webui/wuicontentbase.py (modified) (1 diff)
• tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

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

@@ -213 +213 @@
         """Flushes XML output if buffered."""
         _ = fRetry; _ = fForce;
-        return None;
+        return True;
 
     #
@@ -1792 +1792 @@
     finally:
         g_oLock.release();
+        fRc = False;
     return fRc;
 
@@ -1871 +1872 @@
     finally:
         g_oLock.release();
+        fRc = False;
     return fRc;
 

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

@@ -1939 +1939 @@
             try:
                 select.select([oSocket, oWakeupR], [], [oSocket, oWakeupR], cMsTimeout / 1000.0);
-            except socket.error as e:
-                if e[0] != errno.EBADF  or  not self.fConnectCanceled:
+            except socket.error as oXctp:
+                if oXctp.errno != errno.EBADF  or  not self.fConnectCanceled:
                     raise;
                 reporter.log('socket.select() on accept was canceled');
@@ -1950 +1950 @@
             try:
                 (oClientSocket, tClientAddr) = oSocket.accept();
-            except socket.error as e:
+            except socket.error as oXcpt:
                 if not self.__isInProgressXcpt(e):
-                    if e[0] != errno.EBADF  or  not self.fConnectCanceled:
+                    if oXcpt.errno != errno.EBADF  or  not self.fConnectCanceled:
                         raise;
                     reporter.log('socket.accept() was canceled');

trunk/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py

@@ -155 +155 @@
     """ Local link to the test manager. """
 
-    kdDbgParams = None;
+    kdDbgParams = [];
 
     def __init__(self, sName, sUrlBase, dParams = None, sConfirm = None, sTitle = None,

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

@@ -2253 +2253 @@
                                                     abBuf = abBuf.tobytes();
                                                     sBuf  = abBuf.decode("utf-8");
-                                                if isinstance(abBuf, buffer):
+                                            if sys.version_info <= (2, 7):
+                                                if isinstance(abBuf, buffer):   # pylint: disable=undefined-variable (for 3.0+)
                                                     sBuf = str(abBuf);
                                             for sLine in sBuf.splitlines():