Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2314)

Unified Diff: build/android/emulator.py

Issue 10781032: restarting adb server before each testing start will cause conflict for multiple emulators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix issues for bulach's comments Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/pylib/single_test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/emulator.py
diff --git a/build/android/emulator.py b/build/android/emulator.py
index d4f3caa409272f35f97022e1bf099f20ea08cc77..106f61c556bc4f7fd6481aa718f4a1a27613e990 100755
--- a/build/android/emulator.py
+++ b/build/android/emulator.py
@@ -149,6 +149,10 @@ class Emulator(object):
return ('emulator-%d' % port, port)
def _CreateAVD(self, avd_name):
+ """Creates an AVD with the given name.
+
+ Return avd_name.
+ """
avd_command = [
self.android,
'--silent',
@@ -166,9 +170,10 @@ class Emulator(object):
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):
+ """Delete the AVD of this emulator."""
avd_command = [
John Grabowski 2012/07/23 19:21:15 If the test crashes (e.g. python error), do we "le
self.android,
'--silent',
« no previous file with comments | « no previous file | build/android/pylib/single_test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698