Add option to restart usb on device status check before performing check.

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
 import smtplib
+import subprocess
 import sys
 import re
 import urllib
 
+import bb_utils

[tonyg, 2013/10/10 01:56:11]

nit: alphabetize below bb_annotations

[navabi, 2013/10/10 02:10:21]

Done.

 import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__),
                              os.pardir, os.pardir, 'util', 'lib',
                              'common'))
 import perf_tests_results_helper  # pylint: disable=F0401
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import android_commands
 from pylib import constants
@@ skipping 170 matching lines @@
   msg_body = '\r\n'.join(['From: %s' % from_address, 'To: %s' % to_address,
                           'Subject: %s' % subject, '', msg])
   try:
     server = smtplib.SMTP('localhost')
     server.sendmail(from_address, [to_address], msg_body)
     server.quit()
   except Exception as e:
     print 'Failed to send alert email. Error: %s' % e
 
 
+def restart_usb():

[tonyg, 2013/10/10 01:56:11]

style nit: RestartUsb()

[navabi, 2013/10/10 02:10:21]

Done.

+  # Expects restart_usb to be installed (BUG=305769)

[tonyg, 2013/10/10 01:56:11]

This comment doesn't add value, I'd drop it.

[navabi, 2013/10/10 02:10:21]

Done.

+  if not os.path.isfile('/usr/bin/restart_usb'):
+    print ('WARNING: Could not restart usb. /usr/bin/restart_usb not installed '
+           'on host (see BUG=305769).')
+    return
+
+  lsusb_proc = bb_utils.SpawnCmd(['lsusb'], stdout=subprocess.PIPE)
+  lsusb_output, _ = lsusb_proc.communicate()
+  if lsusb_proc.returncode:
+    print ('WARNING: Could not restart usb. Error getting list of USB ports.')
+    return
+
+  usb_devices = [re.findall('Bus (\d\d\d) Device (\d\d\d)', lsusb_line)[0]
+                 for lsusb_line in lsusb_output.strip().split('\n')]
+
+  # 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':
+      proc = bb_utils.SpawnCmd(['/usr/bin/restart_usb', bus, dev])

[tonyg, 2013/10/10 01:56:11]

Do you want RunCmd instead of SpawnCmd+communicate here?

[navabi, 2013/10/10 02:10:21]

Done.

+      proc.communicate()
+      if proc.returncode:
+        print 'Error restarting USB device /dev/bus/usb/%s/%s' % (bus, dev)
+      else:
+        print 'Restarted USB device /dev/bus/usb/%s/%s' % (bus, dev)
+
+
 def main():
   parser = optparse.OptionParser()
   parser.add_option('', '--out-dir',
                     help='Directory where the device path is stored',
                     default=os.path.join(constants.DIR_SOURCE_ROOT, 'out'))
   parser.add_option('--no-provisioning-check', action='store_true',
                     help='Will not check if devices are provisioned properly.')
   parser.add_option('--device-status-dashboard', action='store_true',
                     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:
+    restart_usb()
+
   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 = [], [], [], [], []
   fail_step_lst = []
   if devices:
     types, builds, batteries, reports, errors, fail_step_lst = (
@@ skipping 35 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())