Changeset 59884 in vbox for trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py

Timestamp:

Mar 1, 2016 11:27:30 AM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/usb: Add a new gadget type using the dummy_hcd module to use gadgets on the machine executing the test

File:

• trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py (modified) (9 diffs)

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

@@ -9 +9 @@
 __copyright__ = \
 """
-Copyright (C) 2014-2015 Oracle Corporation
+Copyright (C) 2014-2016 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
@@ -105 +105 @@
         self.cUsbReattachCycles    = self.cUsbReattachCyclesDef;
         self.sHostname             = socket.gethostname().lower();
+        self.fUseTxs               = True;
 
     #
@@ -112 +113 @@
         rc = vbox.TestDriver.showUsage(self);
         reporter.log('');
-        reporter.log('tdStorageBenchmark1 Options:');
+        reporter.log('tdUsb1 Options:');
         reporter.log('  --virt-modes    <m1[:m2[:]]');
         reporter.log('      Default: %s' % (':'.join(self.asVirtModesDef)));
@@ -131 +132 @@
         reporter.log('  --usb-reattach-cycles <cycles>');
         reporter.log('      Default: %s' % (self.cUsbReattachCyclesDef));
+        reporter.log('  --local');
+        reporter.log('      Don\'t use TXS for communication with the gadget but do everything');
+        reporter.log('      on this host');
         return rc;
 
@@ -196 +200 @@
                 raise base.InvalidOption('The "--usb-reattach-cycles" value "%s" is zero or negative.' \
                     % (self.cUsbReattachCycles,));
+        elif asArgs[iArg] == '--local':
+            self.fUseTxs = False;
         else:
             return vbox.TestDriver.parseOption(self, asArgs, iArg);
@@ -288 +294 @@
         """
         # Get configured USB test devices from hostname we are running on
-        sGadgetHost, sGadgetType = self.getGadgetParams(self.sHostname, sSpeed);
+        if self.fUseTxs is True:
+            sGadgetHost, sGadgetType = self.getGadgetParams(self.sHostname, sSpeed);
+        else:
+            sGadgetHost = 'dummy';
+            sGadgetType = usbgadget.g_ksGadgetTypeDummyHcd;
 
         # Create device filter
@@ -295 +305 @@
             oUsbGadget = usbgadget.UsbGadget();
             reporter.log('Connecting to gadget: ' + sGadgetType);
-            fRc = oUsbGadget.connectTo(30 * 1000, sGadgetType, sGadgetHost);
+            fRc = oUsbGadget.connectTo(30 * 1000, sGadgetType, self.fUseTxs, sGadgetHost);
             if fRc is True:
                 reporter.log('Connect succeeded');
@@ -330 +340 @@
         """
         # Get configured USB test devices from hostname we are running on
-        sGadgetHost, sGadgetType = self.getGadgetParams(self.sHostname, sSpeed);
+        if self.fUseTxs is True:
+            sGadgetHost, sGadgetType = self.getGadgetParams(self.sHostname, sSpeed);
+        else:
+            sGadgetHost = 'dummy';
+            sGadgetType = usbgadget.g_ksGadgetTypeDummyHcd;
 
         # Create device filter
@@ -337 +351 @@
             oUsbGadget = usbgadget.UsbGadget();
             reporter.log('Connecting to gadget: ' + sGadgetType);
-            fRc = oUsbGadget.connectTo(30 * 1000, sGadgetType, sGadgetHost);
+            fRc = oUsbGadget.connectTo(30 * 1000, sGadgetType, self.fUseTxs, sGadgetHost);
             if fRc is True:
                 reporter.log('Connect succeeded');