[Android] Break GTest emulator launching into a separate function.

build/android/run_tests.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.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
@@ skipping 89 matching lines @@
                              for t in all_test_suites]
   for t, q in zip(all_test_suites, qualified_test_suites):
     if not os.path.exists(q):
       raise Exception('Test suite %s not found in %s.\n'
                       'Supported test suites:\n %s\n'
                       'Ensure it has been built.\n' %
                       (t, q, _TEST_SUITES))
   return qualified_test_suites
 
 
+def LaunchEmulators(emulator_count, fast_and_loose=False):

[frankf, 2013/01/07 23:13:07]

if this is private to the module, prefix with underscore.

[craigdh, 2013/01/07 23:46:14]

Moved to emulator.py so it can be reused.

+  """Launch multiple emulators and wait for them to boot.
+
+  Args:
+    emulator_count: number of emulators to launch.
+
+  Returns:
+    List of emulators.
+  """
+  emulators = []
+  for n in xrange(emulator_count):
+    t = time_profile.TimeProfile('Emulator launch %d' % n)
+    avd_name = None
+    if n > 0:
+      # Creates a temporary AVD for the extra emulators.
+      avd_name = 'run_tests_avd_%d' % n
+    logging.info('Emulator launch %d with avd_name=%s', n, avd_name)
+    emu = emulator.Emulator(avd_name, fast_and_loose)
+    emu.Launch(kill_all_emulators=n == 0)
+    t.Stop()
+    emulators.append(emu)
+  # Wait for all emulators to boot completed.
+  for emu in emulators:
+    emu.ConfirmLaunch(True)
+  return emulators
+
+
 class TestSharder(BaseTestSharder):
   """Responsible for sharding the tests on the connected devices."""
 
   def __init__(self, attached_devices, test_suite, gtest_filter,
                test_arguments, timeout, cleanup_test_files, tool,
                log_dump_name, fast_and_loose, build_type, in_webkit_checkout,
                flakiness_server=None):
     BaseTestSharder.__init__(self, attached_devices, build_type)
     self.test_suite = test_suite
     self.gtest_filter = gtest_filter or ''
@@ skipping 120 matching lines @@
 
   Returns:
     0 if successful, number of failing tests otherwise.
   """
   step_name = os.path.basename(options.test_suite).replace('-debug.apk', '')
   buildbot_report.PrintNamedStep(step_name)
   attached_devices = []
   buildbot_emulators = []
 
   if options.use_emulator:
-    for n in range(options.emulator_count):
-      t = time_profile.TimeProfile('Emulator launch %d' % n)
-      avd_name = None
-      if n > 0:
-        # Creates a temporary AVD for the extra emulators.
-        avd_name = 'run_tests_avd_%d' % n
-      buildbot_emulator = emulator.Emulator(avd_name, options.fast_and_loose)
-      buildbot_emulator.Launch(kill_all_emulators=n == 0)
-      t.Stop()
-      buildbot_emulators.append(buildbot_emulator)
-      attached_devices.append(buildbot_emulator.device)
-    # Wait for all emulators to boot completed.
-    map(lambda buildbot_emulator: buildbot_emulator.ConfirmLaunch(True),
-        buildbot_emulators)
+    buildbot_emulators = LaunchEmulators(options.emulator_count,
+                                         fast_and_loose=options.fast_and_loose)
+    attached_devices = [e.device for e in buildbot_emulators]
   elif options.test_device:
     attached_devices = [options.test_device]
   else:
     attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     buildbot_report.PrintError()
     return 1
 
@@ skipping 141 matching lines @@
   # the batch (this happens because the exit status is a sum of all failures
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.exit_code:
     return failed_tests_count
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))