Android: adds device affinity for perf tests.

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 13 matching lines @@
                              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
 from pylib.cmd_helper import GetCmdOutput
 from pylib.device import device_blacklist
 from pylib.device import device_errors
+from pylib.device import device_list
 from pylib.device import device_utils
 
 def DeviceInfo(serial, options):
   """Gathers info on a device via various adb calls.
 
   Args:
     serial: The serial of the attached device to construct info about.
 
   Returns:
     Tuple of device type, build id, report as a string, error messages, and
@@ skipping 57 matching lines @@
     except device_errors.CommandFailedError as e:
       # Attempt shutdown anyway.
       # TODO(jbudorick) Handle this exception appropriately after interface
       #                 conversions are finished.
       logging.error(str(e))
     device_adb.old_interface.Shutdown()
   full_report = '\n'.join(report)
   return device_type, device_build, battery_level, full_report, errors, True
 
 
-def GetLastDevices(out_dir):
-  """Returns a list of devices that have been seen on the bot.
-
-  Args:
-    options: out_dir parameter of options argument is used as the base
-             directory to load and update the cache file.
-
-  Returns: List of device serial numbers that were on the bot.
-  """
-  devices_path = os.path.join(out_dir, '.last_devices')
-  devices = []
-  try:
-    with open(devices_path) as f:
-      devices = f.read().splitlines()
-  except IOError:
-    # Ignore error, file might not exist
-    pass
-  return devices
-
-
 def CheckForMissingDevices(options, adb_online_devs):
   """Uses file of previous online devices to detect broken phones.
 
   Args:
     options: out_dir parameter of options argument is used as the base
              directory to load and update the cache file.
     adb_online_devs: A list of serial numbers of the currently visible
                      and online attached devices.
   """
   # TODO(navabi): remove this once the bug that causes different number
   # of devices to be detected between calls is fixed.
   logger = logging.getLogger()
   logger.setLevel(logging.INFO)
 
   out_dir = os.path.abspath(options.out_dir)
 
-  def WriteDeviceList(file_name, device_list):
-    path = os.path.join(out_dir, file_name)
-    if not os.path.exists(out_dir):
-      os.makedirs(out_dir)
-    with open(path, 'w') as f:
-      # Write devices currently visible plus devices previously seen.
-      f.write('\n'.join(set(device_list)))
-
-  last_devices_path = os.path.join(out_dir, '.last_devices')
-  last_devices = GetLastDevices(out_dir)
+  last_devices_path = os.path.join(out_dir, device_list.LAST_DEVICES_FILENAME)
+  try:
+    last_devices = device_list.GetPersistentDeviceList(last_devices_path)
+  except IOError:
+    # Ignore error, file might not exist
+    last_devices = []
   missing_devs = list(set(last_devices) - set(adb_online_devs))
 
   all_known_devices = list(set(adb_online_devs) | set(last_devices))
-  WriteDeviceList('.last_devices', all_known_devices)
-  WriteDeviceList('.last_missing', missing_devs)
+  device_list.WritePersistentDeviceList(last_devices_path, all_known_devices)
+  device_list.WritePersistentDeviceList(
+      os.path.join(out_dir, device_list.LAST_MISSING_DEVICES_FILENAME),
+      missing_devs)
 
   if not all_known_devices:
     # This can happen if for some reason the .last_devices file is not
     # present or if it was empty.
     return ['No online devices. Have any devices been plugged in?']
   if missing_devs:
     devices_missing_msg = '%d devices not detected.' % len(missing_devs)
     bb_annotations.PrintSummaryText(devices_missing_msg)
 
     # TODO(navabi): Debug by printing both output from GetCmdOutput and
@@ skipping 110 matching lines @@
   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)
 
   # Remove the last build's "bad devices" before checking device statuses.
   device_blacklist.ResetBlacklist()
 
   if options.restart_usb:
-    expected_devices = GetLastDevices(os.path.abspath(options.out_dir))
+    try:
+      expected_devices = device_list.GetPersistentDeviceList(
+          os.path.join(options.out_dir, device_list.LAST_DEVICES_FILENAME))
+    except IOError:
+      expected_devices = []
     devices = android_commands.GetAttachedDevices()
     # Only restart usb if devices are missing.
     if set(expected_devices) != set(devices):
       KillAllAdb()
       retries = 5
       usb_restarted = True
       if not RestartUsb():
         usb_restarted = False
         bb_annotations.PrintWarning()
         print 'USB reset stage failed, wait for any device to come back.'
@@ skipping 56 matching lines @@
     # devices with critically low battery. 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())