Changeset 61831 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 22, 2016 9:06:11 PM (9 years ago)

Author:

vboxsync

Message:

txsclient.py,usbgadget.py: pylint 1.5.5 fixes

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/txsclient.py (modified) (7 diffs)
• tests/usb/usbgadget.py (modified) (1 diff)

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

@@ -201 +201 @@
         """
         _ = cb; _ = cMsTimeout; _ = fNoDataOk;
-        return False;
+        return None;
 
     def isConnectionOk(self):
@@ -551 +551 @@
         so the client can inspect it later on.
         """
-        if cMsTimeout == None:
+        if cMsTimeout is None:
             cMsTimeout = self.getMsLeft(500);
         cbMsg, sOpcode, abPayload = self.oTransport.recvMsg(cMsTimeout, fNoDataOk);
@@ -613 +613 @@
         Wrapper for TransportBase.sendMsg that inserts the correct timeout.
         """
-        if cMsTimeout == None:
+        if cMsTimeout is None:
             cMsTimeout = self.getMsLeft(500);
         return self.oTransport.sendMsg(sOpcode, cMsTimeout, aoPayload);
@@ -768 +768 @@
                 if cbMsg is None:
                     cbMsg, sOpcode, abPayload = self.recvReply(cMsTimeout=500, fNoDataOk=True);
-                    if cbMsg == None:
+                    if cbMsg is None:
                         # Check for time out before restarting the loop.
                         # Note! Only doing timeout checking here does mean that
@@ -865 +865 @@
             # Parse the exit status (True), abort (None) or do nothing (False).
             if rc is True:
-                if sOpcode == 'PROC OK':
-                    rc = True;
-                else:
+                if sOpcode != 'PROC OK':
                     # Do proper parsing some other day if needed:
                     #   PROC TOK, PROC TOA, PROC DWN, PROC DOO,
@@ -1075 +1073 @@
                 # Convert to array - this is silly!
                 abBuf = array.array('B');
-                for i in range(len(sRaw)):
+                for i, _ in enumerate(sRaw):
                     abBuf.append(ord(sRaw[i]));
                 sRaw = None;
@@ -1348 +1346 @@
         oStdErr   = reporter.FileWrapper('%sstderr' % sPrefix);
         if fWithTestPipe:   oTestPipe = reporter.FileWrapperTestPipe();
-        else:               oTestPipe = '/dev/null';
+        else:               oTestPipe = '/dev/null'; # pylint: disable=redefined-variable-type
 
         return self.startTask(cMsTimeout, fIgnoreErrors, "exec", self.taskExecEx,

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

@@ -293 +293 @@
         """
         _ = cb; _ = cMsTimeout; _ = fNoDataOk;
-        return False;
+        return None;
 
     def isConnectionOk(self):