[Android] Split uiautomator test runner from instrumentation.

build/android/pylib/host_driven/run_python_tests.py

 # 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 the Python tests (relies on using the Java test runner)."""
 
 import logging
 import os
 import sys
 import types
@@ skipping 53 matching lines @@
   if options.device:
     attached_devices = [options.device]
 
   test_collection = TestInfoCollection()
   all_tests = _GetAllTests(options.python_test_root, options.official_build)
   test_collection.AddTests(all_tests)
   test_names = [t.qualified_name for t in all_tests]
   logging.debug('All available tests: ' + str(test_names))
 
   available_tests = test_collection.GetAvailableTests(
-      options.annotation, options.test_filter)
+      options.annotations, options.test_filter)
 
   if not available_tests:
     logging.warning('No Python tests to run with current args.')
     return base_test_result.TestRunResults()
 
-  available_tests *= options.number_of_runs
   test_names = [t.qualified_name for t in available_tests]
   logging.debug('Final list of tests to run: ' + str(test_names))
 
   # Copy files to each device before running any tests.
   for device_id in attached_devices:
     logging.debug('Pushing files to device %s', device_id)
     test_pkg = test_package.TestPackage(options.test_apk_path,
                                         options.test_apk_jar_path)
     test_files_copier = test_runner.TestRunner(
         options, device_id, 0, test_pkg, [])
@@ skipping 108 matching lines @@
   Returns:
     List of test case objects for all available test methods.
   """
   if not test_root:
     return []
   all_tests = []
   test_module_list = _GetTestModules(test_root, is_official_build)
   for module in test_module_list:
     all_tests.extend(_GetTestClassesFromModule(module))
   return all_tests