Changeset 71983 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2018 2:11:09 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit/tdUsb1: Needed more changes to truly turn gadget host connect failures into a reason for skipping the test, because the error when taskConnect detected a timeout was overriding the test status.

Location:

trunk/src/VBox/ValidationKit/tests/usb

Files:

• tdUsb1.py (modified) (2 diffs)
• usbgadget.py (modified) (2 diffs)

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

@@ -384 +384 @@
         oUsbGadget = usbgadget.UsbGadget();
         reporter.log('Connecting to UTS: ' + sGadgetHost);
-        fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost, uPort = uGadgetPort);
+        fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost, uPort = uGadgetPort, fTryConnect = True);
         if fRc is True:
             reporter.log('Connect succeeded');
@@ -432 +432 @@
         oUsbGadget = usbgadget.UsbGadget();
         reporter.log('Connecting to UTS: ' + sGadgetHost);
-        fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost,  uPort = uGadgetPort);
+        fRc = oUsbGadget.connectTo(30 * 1000, sGadgetHost,  uPort = uGadgetPort, fTryConnect = True);
         if fRc is True:
             self.oVBox.host.addUSBDeviceSource('USBIP', sGadgetHost, sGadgetHost + (':%s' % oUsbGadget.getUsbIpPort()), [], []);

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

@@ -1415 +1415 @@
         return (self.iBusId, self.iDevId);
 
-    def connectTo(self, cMsTimeout, sHostname, uPort = None, fUsbIpSupport = True, cMsIdleFudge = 0):
+    def connectTo(self, cMsTimeout, sHostname, uPort = None, fUsbIpSupport = True, cMsIdleFudge = 0, fTryConnect = False):
         """
         Connects to the specified target device.
@@ -1431 +1431 @@
         try:
             oTransport = TransportTcp(sHostname, uPort);
-            self.oUtsSession = Session(oTransport, cMsTimeout, cMsIdleFudge);
+            self.oUtsSession = Session(oTransport, cMsTimeout, cMsIdleFudge, fTryConnect);
 
             if self.oUtsSession is not None: