Android: wait for at least one device if usb restart fails.

build/android/buildbot/bb_device_status_check.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A class to keep track of devices across builds and report state."""
 import logging
 import optparse
 import os
@@ skipping 207 matching lines @@
     server.sendmail(from_address, [to_address], msg_body)
     server.quit()
   except Exception as e:
     print 'Failed to send alert email. Error: %s' % e
 
 
 def RestartUsb():
   if not os.path.isfile('/usr/bin/restart_usb'):
     print ('ERROR: Could not restart usb. /usr/bin/restart_usb not installed '
            'on host (see BUG=305769).')
-    return 1
+    return False
 
   lsusb_proc = bb_utils.SpawnCmd(['lsusb'], stdout=subprocess.PIPE)
   lsusb_output, _ = lsusb_proc.communicate()
   if lsusb_proc.returncode:
     print ('Error: Could not get list of USB ports (i.e. lsusb).')
     return lsusb_proc.returncode
 
   usb_devices = [re.findall('Bus (\d\d\d) Device (\d\d\d)', lsusb_line)[0]
                  for lsusb_line in lsusb_output.strip().split('\n')]
 
-  failed_restart = False
+  restarted = True

[navabi, 2014/01/09 23:31:39]

This boolean indicates if all usb devices were restarted, right? If so, change
name from restarted to all_restarted.

[bulach, 2014/01/10 09:08:05]

good point! done.

   # Walk USB devices from leaves up (i.e reverse sorted) restarting the
   # connection. If a parent node (e.g. usb hub) is restarted before the
   # devices connected to it, the (bus, dev) for the hub can change, making the
   # output we have wrong. This way we restart the devices before the hub.
   for (bus, dev) in reversed(sorted(usb_devices)):
     # Can not restart root usb connections
     if dev != '001':
       return_code = bb_utils.RunCmd(['/usr/bin/restart_usb', bus, dev])
       if return_code:
         print 'Error restarting USB device /dev/bus/usb/%s/%s' % (bus, dev)
-        failed_restart = True
+        restarted = False
       else:
         print 'Restarted USB device /dev/bus/usb/%s/%s' % (bus, dev)
 
-  if failed_restart:
-    return 1
-
-  return 0
+  return restarted
 
 
 def KillAllAdb():
   def GetAllAdb():
     for p in psutil.process_iter():
       try:
         if 'adb' in p.name:
           yield p
       except psutil.error.NoSuchProcess:
         pass
@@ skipping 24 matching lines @@
                     help='Output device status data for dashboard.')
   parser.add_option('--restart-usb', action='store_true',
                     help='Restart USB ports before running device check.')
   options, args = parser.parse_args()
   if args:
     parser.error('Unknown options %s' % args)
 
   if options.restart_usb:
     expected_devices = GetLastDevices(os.path.abspath(options.out_dir))
     devices = android_commands.GetAttachedDevices()
-    # Only restart usb if devices are missing
+    # Only restart usb if devices are missing.
     if set(expected_devices) != set(devices):
       KillAllAdb()
       retries = 5
-      if RestartUsb():
+      usb_restarted = True
+      if not RestartUsb():
+        usb_restarted = False
         bb_annotations.PrintWarning()
-        print "USB reset stage failed, continuing anyway."
-        retries = 0
+        print 'USB reset stage failed, wait for any device to come back.'
       while retries:
         time.sleep(1)
         devices = android_commands.GetAttachedDevices()
         if set(expected_devices) == set(devices):
+          # All devices are online, keep going.
+          break
+        if not usb_restarted and devices:
+          # The USB wasn't restarted, but there's at least one device online.
+          # No point in trying to wait for all devices.
           break
         retries -= 1
 
   devices = android_commands.GetAttachedDevices()
   # TODO(navabi): Test to make sure this fails and then fix call
   offline_devices = android_commands.GetAttachedDevices(hardware=False,
                                                         emulator=False,
                                                         offline=True)
 
   types, builds, batteries, reports, errors = [], [], [], [], []
@@ skipping 38 matching lines @@
     # devices with critically low battery or install speed. Remove those devices
     # from testing, allowing build to continue with good devices.
     return 1
 
   if not devices:
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())