[Android] Extract device blacklisting into its own module.

build/android/pylib/android_commands.py

 # Copyright (c) 2012 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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 21 matching lines @@
   from pylib import pexpect
 except ImportError:
   pexpect = None
 
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
 import adb_interface
 import am_instrument_parser
 import errors
 
+from pylib.device import device_blacklist
 
 # Pattern to search for the next whole line of pexpect output and capture it
 # into a match group. We can't use ^ and $ for line start end with pexpect,
 # see http://www.noah.org/python/pexpect/#doc for explanation why.
 PEXPECT_LINE_RE = re.compile('\n([^\r]*)\r')
 
 # Set the adb shell prompt to be a unique marker that will [hopefully] not
 # appear at the start of any line of a command's output.
 SHELL_PROMPT = '~+~PQ\x17RS~+~'
 
@@ skipping 20 matching lines @@
 MD5SUM_DEVICE_PATH = MD5SUM_DEVICE_FOLDER + 'md5sum_bin'
 MD5SUM_LD_LIBRARY_PATH = 'LD_LIBRARY_PATH=%s' % MD5SUM_DEVICE_FOLDER
 
 
 def GetAVDs():
   """Returns a list of AVDs."""
   re_avd = re.compile('^[ ]+Name: ([a-zA-Z0-9_:.-]+)', re.MULTILINE)
   avds = re_avd.findall(cmd_helper.GetCmdOutput(['android', 'list', 'avd']))
   return avds
 
-
 def ResetBadDevices():
-  """Removes the file that keeps track of bad devices for a current build."""
-  if os.path.exists(constants.BAD_DEVICES_JSON):
-    os.remove(constants.BAD_DEVICES_JSON)
-
+  """Removes the blacklist that keeps track of bad devices for a current
+     build.
+  """
+  device_blacklist.ResetBlacklist()
 
 def ExtendBadDevices(devices):
-  """Adds devices to BAD_DEVICES_JSON file.
+  """Adds devices to the blacklist that keeps track of bad devices for a
+     current build.
 
-  The devices listed in the BAD_DEVICES_JSON file will not be returned by
+  The devices listed in the bad devices file will not be returned by
   GetAttachedDevices.
 
   Args:
-    devices: list of bad devices to be added to the BAD_DEVICES_JSON file.
+    devices: list of bad devices to be added to the bad devices file.
   """
-  if os.path.exists(constants.BAD_DEVICES_JSON):
-    with open(constants.BAD_DEVICES_JSON, 'r') as f:
-      bad_devices = json.load(f)
-    devices.extend(bad_devices)
-  with open(constants.BAD_DEVICES_JSON, 'w') as f:
-    json.dump(list(set(devices)), f)
+  device_blacklist.ExtendBlacklist(devices)
 
 
 def GetAttachedDevices(hardware=True, emulator=True, offline=False):
   """Returns a list of attached, android devices and emulators.
 
   If a preferred device has been set with ANDROID_SERIAL, it will be first in
   the returned list. The arguments specify what devices to include in the list.
 
   Example output:
 
@@ skipping 29 matching lines @@
   elif hardware:
     devices = [device for device in online_devices
                if device not in emulator_devices]
   elif emulator:
     devices = emulator_devices
 
   # Now add offline devices if offline is true
   if offline:
     devices = devices + offline_devices
 
-  # Remove bad devices listed in the bad_devices json file.
-  if os.path.exists(constants.BAD_DEVICES_JSON):
-    with open(constants.BAD_DEVICES_JSON, 'r') as f:
-      bad_devices = json.load(f)
-    logging.info('Avoiding bad devices %s', ' '.join(bad_devices))
-    devices = [device for device in devices if device not in bad_devices]
+  # Remove any devices in the blacklist.
+  blacklist = device_blacklist.ReadBlacklist()
+  if len(blacklist):
+    logging.info('Avoiding bad devices %s', ' '.join(blacklist))
+    devices = [device for device in devices if device not in blacklist]
 
   preferred_device = os.environ.get('ANDROID_SERIAL')
   if preferred_device in devices:
     devices.remove(preferred_device)
     devices.insert(0, preferred_device)
   return devices
 
 
 def IsDeviceAttached(device):
   """Return true if the device is attached and online."""
@@ skipping 1673 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()