restarting adb server before each testing start will cause conflict for multiple emulators

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.
 """
 
 import collections
@@ skipping 185 matching lines @@
 
 
 def GetLogTimestamp(log_line, year):
   """Returns the timestamp of the given |log_line| in the given year."""
   try:
     return datetime.datetime.strptime('%s-%s' % (year, log_line[:18]),
                                       '%Y-%m-%d %H:%M:%S.%f')
   except (ValueError, IndexError):
     logging.critical('Error reading timestamp from ' + log_line)
     return None
 

[bulach, 2012/07/17 10:26:08]

nit: the styleguide requires two \n between top-levels, so please add one here,
then another one before KillAdbServer, and another one before StartAdbServer

+def RestartAdbServer():
+  """Restart the adb server."""
+  KillAdbServer()
+  StartAdbServer()
+
+def KillAdbServer():
+  """Kill adb server."""
+  adb_cmd = ['adb', 'kill-server']
+  return cmd_helper.RunCmd(adb_cmd)
+
+def StartAdbServer():
+  """Start adb server."""
+  adb_cmd = ['adb', 'start-server']
+  return cmd_helper.RunCmd(adb_cmd)
+
 
 class AndroidCommands(object):
   """Helper class for communicating with Android device via adb.
 
   Args:
     device: If given, adb commands are only send to the device of this ID.
         Otherwise commands are sent to all attached devices.
   """
 
   def __init__(self, device=None):
@@ skipping 95 matching lines @@
 
     logging.info('>>> $' + install_command)
     return self._adb.SendCommand(install_command, timeout_time=2*60)
 
   def MakeSystemFolderWritable(self):
     """Remounts the /system folder rw.  """
     out = self._adb.SendCommand('remount')
     if out.strip() != 'remount succeeded':
       raise errors.MsgException('Remount failed: %s' % out)
 
-  def RestartAdbServer(self):
-    """Restart the adb server."""
-    self.KillAdbServer()
-    self.StartAdbServer()
-
-  def KillAdbServer(self):
-    """Kill adb server."""
-    adb_cmd = ['adb', 'kill-server']
-    return cmd_helper.RunCmd(adb_cmd)
-
-  def StartAdbServer(self):
-    """Start adb server."""
-    adb_cmd = ['adb', 'start-server']
-    return cmd_helper.RunCmd(adb_cmd)
-
   def WaitForSystemBootCompleted(self, wait_time):
     """Waits for targeted system's boot_completed flag to be set.
 
     Args:
       wait_time: time in seconds to wait
 
     Raises:
       WaitForResponseTimedOutError if wait_time elapses and flag still not
       set.
     """
@@ skipping 587 matching lines @@
           if len(process_results) <= 8:
             continue
           # Column 0 is the executable name
           # Column 1 is the pid
           # Column 8 is the Inode in use
           if process_results[8] == socket_name:
             pids.append( (int(process_results[1]), process_results[0]) )
         break
     logging.info('PidsUsingDevicePort: %s', pids)
     return pids