Increase Android test robustness.

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 114 matching lines @@
       try:
         os.kill(self._pid, signal.SIGKILL)
       except:
         pass
       del os.environ['DISPLAY']
       self._pid = 0
 
 
 def RunTests(device, test_suite, gtest_filter, test_arguments, rebaseline,
              timeout, performance_test, cleanup_test_files, tool,
-             log_dump_name):
+             log_dump_name, fast_and_loose=False):
   """Runs the tests.
 
   Args:
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     gtest_filter: A gtest_filter flag.
     test_arguments: Additional arguments to pass to the test binary.
     rebaseline: Whether or not to run tests in isolation and update the filter.
     timeout: Timeout for each test.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
     log_dump_name: Name of log dump file.
+    fast_and_loose: should we go extra-fast but sacrifice stability
+      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)
       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]
   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]
   debug_info_list = []
   print _TEST_SUITES  # So it shows up in buildbot output
   for t in _TEST_SUITES:
     test = SingleTestRunner(device, t, gtest_filter, test_arguments,
                             timeout, rebaseline, performance_test,
-                            cleanup_test_files, tool, not not log_dump_name)
+                            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 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
   attached_devices = []
 
   if options.use_xvfb:
     xvfb = Xvfb()
     xvfb.Start()
 
   if options.use_emulator:
     t = TimeProfile('Emulator launch')
-    buildbot_emulator = emulator.Emulator()
+    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)
+                          options.log_dump,
+                          fast_and_loose=options.fast_and_loose)
   if buildbot_emulator:
     buildbot_emulator.Shutdown()
   if options.use_xvfb:
     xvfb.Stop()
 
-  return len(test_results.failed)
+  # 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)
+  else:
+    return len(test_results.failed)
+
 
 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',
                            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', dest='gtest_filter',
+  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')
   option_parser.add_option('-p', dest='performance_test',
                            help='Indicator of performance test',
                            action='store_true',
                            default=False)
   option_parser.add_option('-L', dest='log_dump',
                            help='file name of log dump, which will be put in'
                            'subfolder debug_info_dumps under the same directory'
                            'in where the test_suite exists.')
   option_parser.add_option('-e', '--emulator', dest='use_emulator',
                            help='Run tests in a new instance of emulator',
                            action='store_true',
                            default=False)
   option_parser.add_option('-x', '--xvfb', dest='use_xvfb',
                            action='store_true', default=False,
                            help='Use Xvfb around tests (ignored if not Linux)')
+  option_parser.add_option('--fast', '--fast_and_loose', dest='fast_and_loose',
+                           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')
   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))