Changes argument passing to use options objects

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
 
 from pylib import android_commands
 from pylib.base import base_test_result
+from pylib.instrumentation import test_options
 from pylib.instrumentation import test_package
 from pylib.instrumentation import test_runner
 from pylib.utils import report_results
 
 import python_test_base
 from python_test_sharder import PythonTestSharder
 from test_info_collection import TestInfoCollection
 
 
 def _GetPythonFiles(root, files):
@@ skipping 56 matching lines @@
     return (base_test_result.TestRunResults(), 0)
 
   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.build_type, options.test_data, options.save_perf_json,
-        options.screenshot_failures, options.tool, options.wait_for_debugger,
-        options.disable_assertions, options.push_deps,
-        options.cleanup_test_files, device_id, 0, test_pkg, [])
+    instrumentation_options = test_options.InstrumentationOptions(
+        options.build_type,
+        options.tool,
+        options.cleanup_test_files,
+        options.push_deps,
+        options.annotations,
+        options.exclude_annotations,
+        options.test_filter,
+        options.test_data,
+        options.save_perf_json,
+        options.screenshot_failures,
+        options.disable_assertions,
+        options.wait_for_debugger,
+        options.test_apk,
+        options.test_apk_path,
+        options.test_apk_jar_path)
+    test_files_copier = test_runner.TestRunner(instrumentation_options,
+                                               device_id, 0, test_pkg, [])
     test_files_copier.InstallTestPackage()
     if options.push_deps:
       logging.info('Pushing data deps to device.')
       test_files_copier.PushDataDeps()
     else:
       logging.warning('Skipping pushing data deps to device.')
 
   # Actually run the tests.
   if len(attached_devices) > 1 and options.wait_for_debugger:
     logging.warning('Debugger can not be sharded, '
@@ skipping 106 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