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

build/android/emulator.py

 #!/usr/bin/env python
 #
 # 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 start and stop Android emulator.
 
 Assumes system environment ANDROID_NDK_ROOT has been set.
 
@@ skipping 131 matching lines @@
     if new_avd_name:
       self.default_avd = False
       self.avd = self._CreateAVD(new_avd_name)
 
   def _DeviceName(self):
     """Return our device name."""
     port = _GetAvailablePort()
     return ('emulator-%d' % port, port)
 
   def _CreateAVD(self, avd_name):
     avd_command = [

[John Grabowski, 2012/07/17 18:09:22]

add docstring. doc return values.

[Wei James(wistoch), 2012/07/20 04:07:01]

fixed. thanks

         self.android,
         '--silent',
         'create', 'avd',
         '--name', avd_name,
         '--abi', self.abi,
         '--target', 'android-15',
         '-c', '64M',
         '--force',
     ]
     avd_process = subprocess.Popen(args=avd_command,
                                    stdin=subprocess.PIPE,
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
     avd_process.stdin.write('no\n')
     avd_process.wait()
     logging.info('Create AVD command: %s', ' '.join(avd_command))
-    return self.avd
+    return avd_name
 
   def _DeleteAVD(self):
     avd_command = [
         self.android,
         '--silent',
         'delete',
         'avd',
         '--name', self.avd,
     ]
     avd_process = subprocess.Popen(args=avd_command,
@@ skipping 109 matching lines @@
     """Install a handler to kill the emulator when we exit unexpectedly."""
     for sig in self._SIGNALS:
       signal.signal(sig, self._ShutdownOnSignal)
 
 def main(argv):
   Emulator(None, True).Launch(True)
 
 
 if __name__ == '__main__':
   main(sys.argv)