Restart the Android emulator for each test.

build/android/run_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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)
    to be deployed to the device (in /data/local/tmp).
@@ skipping 48 matching lines @@
 import debug_info
 import emulator
 import run_tests_helper
 from single_test_runner import SingleTestRunner
 from test_package_executable import TestPackageExecutable
 from test_result import BaseTestResult, TestResults
 
 _TEST_SUITES = ['base_unittests', 'sql_unittests', 'ipc_tests', 'net_unittests']
 
 
+def FullyQualifiedTestSuites():
+  """Return a fully qualified list that represents all known suites."""
+  # If not specified, assume the test suites are in out/Release
+  test_suite_dir = os.path.abspath(os.path.join(run_tests_helper.CHROME_DIR,
+                                                'out', 'Release'))
+  return [os.path.join(test_suite_dir, t) for t in _TEST_SUITES]
+
+
 class TimeProfile(object):
   """Class for simple profiling of action, with logging of cost."""
 
   def __init__(self, description):
     self._description = description
     self.Start()
 
   def Start(self):
     self._starttime = time.time()
 
@@ skipping 71 matching lines @@
       and/or correctness?  Intended for quick cycle testing; not for bots!
 
   Returns:
     A TestResults object.
   """
   results = []
 
   if test_suite:
     global _TEST_SUITES
     if not os.path.exists(test_suite):
-      logging.critical('Unrecognized test suite, supported: %s' %
-                       _TEST_SUITES)
+      logging.critical('Unrecognized test suite %s, supported: %s' %
+                       (test_suite, _TEST_SUITES))
       if test_suite in _TEST_SUITES:
         logging.critical('(Remember to include the path: out/Release/%s)',
                          test_suite)
       return TestResults.FromOkAndFailed([], [BaseTestResult(test_suite, '')])
-    _TEST_SUITES = [test_suite]
+    fully_qualified_test_suites = [test_suite]
   else:
-    # If not specified, assume the test suites are in out/Release
-    test_suite_dir = os.path.abspath(os.path.join(run_tests_helper.CHROME_DIR,
-        'out', 'Release'))
-    _TEST_SUITES = [os.path.join(test_suite_dir, t) for t in _TEST_SUITES]
+    fully_qualified_test_suites = FullyQualifiedTestSuites()
   debug_info_list = []
-  print _TEST_SUITES  # So it shows up in buildbot output
-  for t in _TEST_SUITES:
+  print 'Known suites: ' + str(_TEST_SUITES)
+  print 'Running these: ' + str(fully_qualified_test_suites)
+  for t in fully_qualified_test_suites:
     test = SingleTestRunner(device, t, gtest_filter, test_arguments,
                             timeout, rebaseline, performance_test,
                             cleanup_test_files, tool, not not log_dump_name,
                             fast_and_loose=fast_and_loose)
     test.RunTests()
     results += [test.test_results]
     # Collect debug info.
     debug_info_list += [test.dump_debug_info]
     if rebaseline:
       test.UpdateFilter(test.test_results.failed)
     elif test.test_results.failed:
       # Stop running test if encountering failed test.
       test.test_results.LogFull()
       break
   # Zip all debug info outputs into a file named by log_dump_name.
   debug_info.GTestDebugInfo.ZipAndCleanResults(
       os.path.join(run_tests_helper.CHROME_DIR, 'out', 'Release',
           'debug_info_dumps'),
       log_dump_name, [d for d in debug_info_list if d])
   return TestResults.FromTestResults(results)
 
+def _RunATestSuite(options):
+  """Run a single test suite.
 
-def Dispatch(options):
-  """Dispatches the tests, sharding if possible.
-
-  If options.use_emulator is True, all tests will be run in a new emulator
-  instance.
+  Helper for Dispatch() to allow stop/restart of the emulator across
+  test bundles.  If using the emulator, we start it on entry and stop
+  it on exit.
 
   Args:
     options: options for running the tests.
 
   Returns:
     0 if successful, number of failing tests otherwise.
   """
-  if options.test_suite == 'help':
-    ListTestSuites()
-    return 0
-  buildbot_emulator = None
   attached_devices = []
-
-  if options.use_xvfb:
-    xvfb = Xvfb()
-    xvfb.Start()
-
   if options.use_emulator:
     t = TimeProfile('Emulator launch')
     buildbot_emulator = emulator.Emulator(options.fast_and_loose)
     buildbot_emulator.Launch()
     t.Stop()
     attached_devices.append(buildbot_emulator.device)
   else:
     attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     return 1
 
   test_results = RunTests(attached_devices[0], options.test_suite,
                           options.gtest_filter, options.test_arguments,
                           options.rebaseline, options.timeout,
                           options.performance_test,
                           options.cleanup_test_files, options.tool,
                           options.log_dump,
                           fast_and_loose=options.fast_and_loose)
+
   if buildbot_emulator:
     buildbot_emulator.Shutdown()
-  if options.use_xvfb:
-    xvfb.Stop()
 
   # Another chance if we timed out?  At this point It is safe(r) to
   # run fast and loose since we just uploaded all the test data and
   # binary.
   if test_results.timed_out and options.repeat:
     logging.critical('Timed out; repeating in fast_and_loose mode.')
     options.fast_and_loose = True
     options.repeat = options.repeat - 1
     logging.critical('Repeats left: ' + str(options.repeat))
-    return Dispatch(options)
+    return _RunATestSuite(options)
+  return len(test_results.failed)
+
+
+def Dispatch(options):
+  """Dispatches the tests, sharding if possible.
+
+  If options.use_emulator is True, all tests will be run in a new emulator
+  instance.
+
+  Args:
+    options: options for running the tests.
+
+  Returns:
+    0 if successful, number of failing tests otherwise.
+  """
+  if options.test_suite == 'help':
+    ListTestSuites()
+    return 0
+  buildbot_emulator = None
+
+  if options.use_xvfb:
+    xvfb = Xvfb()
+    xvfb.Start()
+
+  all_test_suites = [options.test_suite] or FullyQualifiedTestSuites()
+  failures = 0
+  if options.use_emulator and options.restart_emulator_each_test:
+    for suite in all_test_suites:
+      options.test_suite = suite
+      failures += _RunATestSuite(options)
   else:
-    return len(test_results.failed)
+    failures += _RunATestSuite(options)
+
+  if options.use_xvfb:
+    xvfb.Stop()
+  return failures
 
 
 def ListTestSuites():
   """Display a list of available test suites
   """
   print 'Available test suites are:'
   for test_suite in _TEST_SUITES:
     print test_suite
 
 
 def main(argv):
   option_parser = run_tests_helper.CreateTestRunnerOptionParser(None,
       default_timeout=0)
-  option_parser.add_option('-s', dest='test_suite',
+  option_parser.add_option('-s', '--suite', dest='test_suite',
                            help='Executable name of the test suite to run '
                            '(use -s help to list them)')
   option_parser.add_option('-r', dest='rebaseline',
                            help='Rebaseline and update *testsuite_disabled',
                            action='store_true',
                            default=False)
   option_parser.add_option('-f', '--gtest_filter', dest='gtest_filter',
                            help='gtest filter')
   option_parser.add_option('-a', '--test_arguments', dest='test_arguments',
                            help='Additional arguments to pass to the test')
@@ skipping 16 matching lines @@
                            action='store_true', default=False,
                            help='Go faster (but be less stable), '
                            'for quick testing.  Example: when tracking down '
                            'tests that hang to add to the disabled list, '
                            'there is no need to redeploy the test binary '
                            'or data to the device again.  '
                            'Don\'t use on bots by default!')
   option_parser.add_option('--repeat', dest='repeat', type='int',
                            default=2,
                            help='Repeat count on test timeout')
+  option_parser.add_option('--restart_emulator_each_test',
+                           default='True',
+                           help='Restart the emulator for each test?')
   options, args = option_parser.parse_args(argv)
   if len(args) > 1:
     print 'Unknown argument:', args[1:]
     option_parser.print_usage()
     sys.exit(1)
   run_tests_helper.SetLogLevel(options.verbose_count)
   return Dispatch(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))