devil: Raise DeviceUnreachableError on cmd output "waiting for device"

devil/devil/android/sdk/adb_wrapper.py

 # 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.
 
 """This module wraps Android's adb tool.
 
 This is a thin wrapper around the adb interface. Any additional complexity
 should be delegated to a higher level (ex. DeviceUtils).
 """
 
@@ skipping 23 matching lines @@
 
 DEFAULT_TIMEOUT = 30
 DEFAULT_RETRIES = 2
 
 _ADB_VERSION_RE = re.compile(r'Android Debug Bridge version (\d+\.\d+\.\d+)')
 _EMULATOR_RE = re.compile(r'^emulator-[0-9]+$')
 _DEVICE_NOT_FOUND_RE = re.compile(r"error: device '(?P<serial>.+)' not found")
 _READY_STATE = 'device'
 _VERITY_DISABLE_RE = re.compile(r'Verity (already )?disabled')
 _VERITY_ENABLE_RE = re.compile(r'Verity (already )?enabled')
+_WAITING_FOR_DEVICE_RE = re.compile(r'- waiting for device -')
 
 
 def VerifyLocalFileExists(path):
   """Verifies a local file exists.
 
   Args:
     path: Path to the local file.
 
   Raises:
     IOError: If the file doesn't exist.
@@ skipping 208 matching lines @@
     except OSError as e:
       if e.errno in (errno.ENOENT, errno.ENOEXEC):
         raise device_errors.NoAdbError(msg=str(e))
       else:
         raise
 
     # Best effort to catch errors from adb; unfortunately adb is very
     # inconsistent with error reporting so many command failures present
     # differently.
     if status != 0 or (check_error and output.startswith('error:')):
-      m = _DEVICE_NOT_FOUND_RE.match(output)
-      if m is not None and m.group('serial') == device_serial:
+      not_found_m = _DEVICE_NOT_FOUND_RE.match(output)
+      device_waiting_m = _WAITING_FOR_DEVICE_RE.match(output)
+      if device_waiting_m is not None or (not_found_m is not None and

[jbudorick, 2017/08/19 00:22:13]

nit: this would be a bit easier to read w/ the line break shuffled around to
match the larger clause break, i.e.

  if (device_waiting_m is not None
      or (not_found_m is not None and not_found_m.group('serial') ==
device_serial)):

[bpastene, 2017/08/19 00:50:31]

Done.

+          not_found_m.group('serial') == device_serial):
         raise device_errors.DeviceUnreachableError(device_serial)
       else:
         raise device_errors.AdbCommandFailedError(
             args, output, status, device_serial)
 
     return output
   # pylint: enable=unused-argument
 
   def _RunDeviceAdbCmd(self, args, timeout, retries, check_error=True):
     """Runs an adb command on the device associated with this object.
@@ skipping 643 matching lines @@
   @property
   def is_emulator(self):
     return _EMULATOR_RE.match(self._device_serial)
 
   @property
   def is_ready(self):
     try:
       return self.GetState() == _READY_STATE
     except device_errors.CommandFailedError:
       return False