Fix mojo_ tools on the first run after adb kill-server.

mojo/devtools/common/devtoolslib/android_shell.py

Index: mojo/devtools/common/devtoolslib/android_shell.py
diff --git a/mojo/devtools/common/devtoolslib/android_shell.py b/mojo/devtools/common/devtoolslib/android_shell.py
index a4a7d16db7261e650c0c776564dc35a6655e537b..269211d7d85ad8c553781e774dddc08f9cc9b8da 100644
--- a/mojo/devtools/common/devtoolslib/android_shell.py
+++ b/mojo/devtools/common/devtoolslib/android_shell.py
@@ -38,6 +38,9 @@ _LOGCAT_NATIVE_TAGS = [
 
 _MOJO_SHELL_PACKAGE_NAME = 'org.chromium.mojo.shell'
 
+# Used to parse the output of `adb devices`.
+_ADB_DEVICES_HEADER = 'List of devices attached'
+
 
 _logger = logging.getLogger()
 
@@ -63,6 +66,23 @@ def _find_available_host_port():
   netstat_output = subprocess.check_output(['netstat'])
   return _find_available_port(netstat_output)
 
+def parse_adb_devices_output(adb_devices_output):
+  """Parses the output of the `adb devices` command, returning a dictionary
+  mapping device id to the status of the device, as printed by `adb devices`.
+  """
+  # Split into lines skipping empty ones.
+  lines = [line.strip() for line in adb_devices_output.split('\n')
+           if line.strip()]
+
+  if _ADB_DEVICES_HEADER not in lines:
+    return None
+
+  # The header can be preceeded by output informing of adb server being spawned,
+  # but all non-empty lines after the header describe connected devices.
+  device_specs = lines[lines.index(_ADB_DEVICES_HEADER) + 1:]
+  return {spec.split()[0]: spec.split()[1] for spec in device_specs
+          if len(spec.split()) == 2}

[qsr, 2015/10/05 14:56:04]

What about cutting this line in two, there is a lot of split() call. Just for
something like
splitted = [spec.split() for spec in device_specs]
return { x[0], x[1] for x in splitted if len(x) == 2 }

[ppi, 2015/10/05 15:17:42]

Done.

+
 
 class AndroidShell(Shell):
   """Wrapper around Mojo shell running on an Android device.
@@ -213,25 +233,24 @@ class AndroidShell(Shell):
     """
     adb_devices_output = subprocess.check_output(
         self._adb_command(['devices']))
-    # Skip the header line, strip empty lines at the end.
-    device_list = [line.strip() for line in adb_devices_output.split('\n')[1:]
-                   if line.strip()]
+    devices = parse_adb_devices_output(adb_devices_output)
+
+    if not devices:
+      return False, 'No devices connected.'
 
     if self.target_device:
-      if any([line.startswith(self.target_device) and
-              line.endswith('device') for line in device_list]):
+      if (self.target_device in devices and
+          devices[self.target_device] == 'device'):
         return True, None
       else:
-        return False, 'Cannot connect to the selected device.'
+        return False, ('Cannot connect to the selected device, status: ' +
+                       devices[self.target_device])
 
-    if len(device_list) > 1:
+    if len(devices) > 1:
       return False, ('More than one device connected and target device not '
                      'specified.')
 
-    if not len(device_list):
-      return False, 'No devices connected.'
-
-    if not device_list[0].endswith('device'):
+    if not devices.itervalues().next() == 'device':
       return False, 'Connected device is not available.'
 
     if require_root and not self._run_adb_as_root():