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

mojo/devtools/common/devtoolslib/android_shell.py

 # Copyright 2014 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.
 
 import atexit
 import hashlib
 import json
 import logging
 import os
 import os.path
@@ skipping 20 matching lines @@
 ]
 
 # Tags used by native logging reflected in the logcat.
 _LOGCAT_NATIVE_TAGS = [
     'chromium',
     'sky',
 ]
 
 _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()
 
 
 def _exit_if_needed(process):
   """Exits |process| if it is still alive."""
   if process.poll() is None:
     process.kill()
 
 
 def _find_available_port(netstat_output, max_attempts=10000):
   opened = [int(x.strip().split()[3].split(':')[1])
             for x in netstat_output if x.startswith(' tcp')]
   for _ in xrange(max_attempts):
     port = random.randint(4096, 16384)
     if port not in opened:
       return port
   else:
     raise Exception('Failed to identify an available port.')
 
 
 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.
 
   Args:
     adb_path: Path to adb, optional if adb is in PATH.
     target_device: Device to run on, if multiple devices are connected.
     logcat_tags: Comma-separated list of additional logcat tags to use.
   """
 
@@ skipping 130 matching lines @@
     device is available. Otherwise, it checks that there is exactly one
     available device.
 
     Returns:
       A tuple of (result, msg). |result| is True iff if the device is correctly
       configured and False otherwise. |msg| is the reason for failure if
       |result| is False and None otherwise.
     """
     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():
       return False, 'Cannot run on an unrooted device.'
 
     return True, None
 
   def install_apk(self, shell_apk_path):
     """Installs the apk on the device.
 
@@ skipping 176 matching lines @@
           Results.output = rf.read()
 
     run_thread = threading.Thread(target=do_run)
     run_thread.start()
     run_thread.join(timeout)
 
     if run_thread.is_alive():
       self.stop_shell()
       return None, Results.output, True
     return None, Results.output, False