Relands test_runner.py, updates buildbot scripts

build/android/pylib/gtest/dispatch.py

 # Copyright (c) 2013 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.
 
+"""Dispatches GTests."""
+
 import copy
 import fnmatch
 import logging
 import os
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import ports
 from pylib.base import shard
@@ skipping 43 matching lines @@
                       'Ensure it has been built.\n' %
                       (t, q, gtest_config.STABLE_TEST_SUITES))
   return qualified_test_suites
 
 
 def GetTestsFromDevice(runner):
   """Get a list of tests from a device, excluding disabled tests.
 
   Args:
     runner: a TestRunner.
+  Returns:
+    All non-disabled tests on the device.
   """
   # The executable/apk needs to be copied before we can call GetAllTests.
   runner.test_package.StripAndCopyExecutable()
   all_tests = runner.test_package.GetAllTests()
   # Only includes tests that do not have any match in the disabled list.
   disabled_list = runner.GetDisabledTests()
   return filter(lambda t: not any([fnmatch.fnmatch(t, disabled_pattern)
                                    for disabled_pattern in disabled_list]),
                 all_tests)
 
@@ skipping 70 matching lines @@
         options.cleanup_test_files,
         options.tool,
         options.build_type,
         options.webkit,
         options.push_deps,
         constants.GTEST_TEST_PACKAGE_NAME,
         constants.GTEST_TEST_ACTIVITY_NAME,
         constants.GTEST_COMMAND_LINE_FILE)
 
   # Get tests and split them up based on the number of devices.
-  if options.gtest_filter:
-    all_tests = [t for t in options.gtest_filter.split(':') if t]
+  if options.test_filter:
+    all_tests = [t for t in options.test_filter.split(':') if t]
   else:
     all_tests = GetAllEnabledTests(RunnerFactory, attached_devices)
   num_devices = len(attached_devices)
   tests = [':'.join(all_tests[i::num_devices]) for i in xrange(num_devices)]
   tests = [t for t in tests if t]
 
   # Run tests.
   test_results = shard.ShardAndRunTests(RunnerFactory, attached_devices, tests,
                                         options.build_type, test_timeout=None,
                                         num_retries=options.num_retries)
@@ skipping 33 matching lines @@
   """
   if options.test_suite == 'help':
     _ListTestSuites()
     return 0
 
   if options.use_xvfb:
     framebuffer = xvfb.Xvfb()
     framebuffer.Start()
 
   all_test_suites = _FullyQualifiedTestSuites(options.exe, options.test_suite,
-                                             options.build_type)
+                                              options.build_type)
   failures = 0
   for suite_name, suite_path in all_test_suites:
     # Give each test suite its own copy of options.
     test_options = copy.deepcopy(options)
     test_options.test_suite = suite_path
     failures += _RunATestSuite(test_options, suite_name)
 
   if options.use_xvfb:
     framebuffer.Stop()
   return failures