Revert changes from e5deb97, fix space detection
The change I1df1fb392dadef8d7cafa08c074dd1634e5deb97 is not needed
because the servo change happened after the 25 branch. Also taking
the opportunity to fix the USB devices whose names are spaces.
BUG=None
TEST=Ran it
Change-Id: If39cbe0c92eb5bcab5facb571ee49a3b3a2aeb80
Reviewed-on: https://gerrit.chromium.org/gerrit/40920
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Stanley Wong <stanleyw@chromium.org>
diff --git a/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py b/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py
index a3c66f2..90ca2aa 100644
--- a/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py
+++ b/server/site_tests/platform_ExternalUSBBootStress/platform_ExternalUSBBootStress.py
@@ -5,7 +5,7 @@
import json, logging, re, time
from autotest_lib.server import autotest, test
-from autotest_lib.server.cros import stress
+from autotest_lib.server.cros import servo, stress
from autotest_lib.client.common_lib import error
_WAIT_DELAY = 5
@@ -29,7 +29,7 @@
unnamed_device_count = 0
for item in items:
columns = item.split(' ')
- if len(columns) == 6:
+ if len(columns) == 6 or len(' '.join(columns[6:]).strip()) == 0:
logging.info('Unnamed device located, adding generic name.')
name = 'Unnamed device %d' % unnamed_device_count
unnamed_device_count += 1
@@ -59,7 +59,7 @@
connected = set_hub_power()
- host.servo.switch_usbkey('dut')
+ host.servo.enable_usb_hub()
host.servo.set('usb_mux_sel3', 'dut_sees_usbkey')
# There are some mice that need the data and power connection to both
@@ -97,7 +97,7 @@
# accelerate booting through dev mode.
host.servo.cold_reset()
host.servo.power_short_press()
- time.sleep(host.servo.BOOT_DELAY)
+ time.sleep(servo.Servo.BOOT_DELAY)
host.servo.ctrl_d()
stressor.start()
host.wait_up(timeout=120)
diff --git a/server/site_tests/platform_ExternalUSBStress/platform_ExternalUSBStress.py b/server/site_tests/platform_ExternalUSBStress/platform_ExternalUSBStress.py
index f78315d..b6421ea 100644
--- a/server/site_tests/platform_ExternalUSBStress/platform_ExternalUSBStress.py
+++ b/server/site_tests/platform_ExternalUSBStress/platform_ExternalUSBStress.py
@@ -52,7 +52,7 @@
unnamed_device_count = 0
for item in items:
columns = item.split(' ')
- if len(columns) == 6:
+ if len(columns) == 6 or len(' '.join(columns[6:]).strip()) == 0:
logging.info('Unnamed device located, adding generic name.')
name = 'Unnamed device %d' % unnamed_device_count
unnamed_device_count += 1
@@ -140,7 +140,7 @@
logging.info('Not using servo for suspend because board %s '
'is not supported.' % m.group(1))
- host.servo.switch_usbkey('dut')
+ host.servo.enable_usb_hub()
host.servo.set('usb_mux_sel3', 'dut_sees_usbkey')
# There are some mice that need the data and power connection to both
