Changeset 60567 in vbox for trunk

Timestamp:

Apr 19, 2016 11:15:23 AM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/usb: Move usbgadget2 to usbgadget and rmeove the old version, smaller fixes for pylint

Location:

trunk/src/VBox/ValidationKit/tests/usb

Files:

• Makefile.kmk (modified) (1 diff)
• tdUsb1.py (modified) (5 diffs)
• usbgadget.py (moved) (moved from trunk/src/VBox/ValidationKit/tests/usb/usbgadget2.py ) (8 diffs)

trunk/src/VBox/ValidationKit/tests/usb/Makefile.kmk

@@ -34 +34 @@
 ValidationKitTestsUsb_EXEC_SOURCES := \
         $(PATH_SUB_CURRENT)/tdUsb1.py \
-        $(PATH_SUB_CURRENT)/usbgadget.py
+        $(PATH_SUB_CURRENT)/usbgadget.py \
+        $(PATH_SUB_CURRENT)/tst-utsgadget.py
 
 VBOX_VALIDATIONKIT_PYTHON_SOURCES += $(ValidationKitTestsUsb_EXEC_SOURCES)

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

@@ -49 +49 @@
 
 # USB gadget control import
-import usbgadget2;
+import usbgadget;
 
 class tdUsbBenchmark(vbox.TestDriver):                                      # pylint: disable=R0902
@@ -308 +308 @@
         sGadgetHost, uGadgetPort = self.getGadgetParams(self.sHostname, sSpeed);
 
-        oUsbGadget = usbgadget2.UsbGadget();
+        oUsbGadget = usbgadget.UsbGadget();
         reporter.log('Connecting to UTS: ' + sGadgetHost);
         fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost, uPort = uGadgetPort);
@@ -316 +316 @@
 
             # Create test device gadget and a filter to attach the device automatically.
-            fRc = oUsbGadget.impersonate(usbgadget2.g_ksGadgetImpersonationTest);
+            fRc = oUsbGadget.impersonate(usbgadget.g_ksGadgetImpersonationTest);
             if fRc is True:
                 iBusId, _ = oUsbGadget.getGadgetBusAndDevId();
@@ -356 +356 @@
         sGadgetHost, uGadgetPort = self.getGadgetParams(self.sHostname, sSpeed);
 
-        oUsbGadget = usbgadget2.UsbGadget();
+        oUsbGadget = usbgadget.UsbGadget();
         reporter.log('Connecting to UTS: ' + sGadgetHost);
         fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost,  uPort = uGadgetPort);
@@ -363 +363 @@
 
             # Create test device gadget and a filter to attach the device automatically.
-            fRc = oUsbGadget.impersonate(usbgadget2.g_ksGadgetImpersonationTest);
+            fRc = oUsbGadget.impersonate(usbgadget.g_ksGadgetImpersonationTest);
             if fRc is True:
                 iBusId, _ = oUsbGadget.getGadgetBusAndDevId();

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

@@ -166 +166 @@
                          (u16 / 256) % 256) );
 
-def u8ToByteArray(u8):
+def u8ToByteArray(uint8):
     """Encodes the u8 value as a little endian byte (B) array."""
-    return array.array('B', (u8 % 256));
+    return array.array('B', (uint8 % 256));
 
 def zeroByteArray(cb):
@@ -174 +174 @@
     abArray = array.array('B', (0, ));
     cb = cb - 1;
-    for i in range(cb):
+    for i in range(cb): # pylint: disable=W0612
         abArray.append(0);
     return abArray;
@@ -609 +609 @@
         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);
@@ -664 +664 @@
         if sOpcode == "FALSE":
             return False;
-        reporter.maybeErr(self.fErr, 'recvAckLogged: %s response was %s: %s' % (sCommand, sOpcode, getSZ(abPayload, 16, sOpcode)));
+        reporter.maybeErr(self.fErr, 'recvAckLogged: %s response was %s: %s' % \
+                                     (sCommand, sOpcode, getSZ(abPayload, 16, sOpcode)));
         return None;
 
@@ -671 +672 @@
         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);
@@ -1037 +1038 @@
                     reporter.fatalXcpt('socket.select() on connect failed');
 
+            # pylint: disable=R0916
             if rc is True:
                 pass;
@@ -1050 +1052 @@
                     reporter.fatalXcpt('socket.connect((%s,%s)) failed; iRc=%s' % (self.sHostname, self.uPort, iRc));
             reporter.log2('TransportTcp::connect: rc=%s iRc=%s' % (rc, iRc));
+            # pylint: enable=R0916
         except:
             reporter.fatalXcpt('socket.connect((%s,%s)) failed' % (self.sHostname, self.uPort));
@@ -1372 +1375 @@
         fRc = True;
 
+        # @todo
+        if fUsbIpSupport is False:
+            return False;
+
         reporter.log2('openTcpSession(%s, %s, %s, %s)' % \
                       (cMsTimeout, sHostname, uPort, cMsIdleFudge));