Creates a new test running script test_runner.py

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 import constants
 from pylib.base import base_test_result
-from pylib.instrumentation import test_package
-from pylib.instrumentation import test_runner
+from pylib.instrumentation import test_package as instrumentation_test_package
+from pylib.instrumentation import test_runner as instrumentation_test_runner
+from pylib.uiautomator import test_package as uiautomator_test_package
+from pylib.uiautomator import test_runner as uiautomator_test_runner
+from pylib.utils import report_results
 
 import python_test_base
 from python_test_caller import CallPythonTest
 from python_test_sharder import PythonTestSharder
 from test_info_collection import TestInfoCollection
 
 
 def _GetPythonFiles(root, files):
   """Returns all files from |files| that end in 'Test.py'.
 
@@ skipping 27 matching lines @@
   Args:
     options: command line options.
 
   Returns:
     A list of test results.
   """
 
   attached_devices = android_commands.GetAttachedDevices()
   if not attached_devices:
     raise Exception('You have no devices attached or visible!')
-  if options.device:
-    attached_devices = [options.device]
+  if options.test_device:
+    attached_devices = [options.test_device]

[frankf, 2013/06/11 02:50:15]

Why this name change?

[gkanwar, 2013/06/12 01:27:32]

There were previously two settings: --device for instrumentation tests, which
set options.device, and --device for GTests which set options.test_device. I
moved this setting to common options in the new script and changed the code here
to options.test_device, so both type of tests now use options.test_device.
On 2013/06/11 02:50:15, frankf wrote:

 
   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.annotations, options.exclude_annotations, options.test_filter)
 
   if not available_tests:
     logging.warning('No Python tests to run with current args.')
     return base_test_result.TestRunResults()
 
   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, [])
-    test_files_copier.PushDependencies()
+    try:
+      test_pkg = instrumentation_test_package.TestPackage(options.test_apk_path,

[frankf, 2013/06/11 02:50:15]

Hmm. Actually let's not touch host_driven tests as they're due for major
refactoring: crbug.com/176323.

[gkanwar, 2013/06/12 01:27:32]

Done.

+                                          options.test_apk_jar_path)
+      test_files_copier = instrumentation_test_runner.TestRunner(
+          options, device_id, 0, test_pkg, [])
+      test_files_copier.PushDependencies()
+    except AttributeError as e:
+      logging.debug('No test APK defined, we are not running '
+                    'non-UIAutomator instrumentation tests.')
+    try:
+      test_pkg = uiautomator_test_package.TestPackage(options.test_apk_path,
+                                          options.test_apk_jar_path)
+      test_files_copier = uiautomator_test_runner.TestRunner(
+          options, device_id, 0, test_pkg, [])
+      test_files_copier.PushDependencies()
+    except AttributeError as e:
+      logging.debug('No test JAR defined, we are not running '
+                    'UIAutomator instrumentation tests.')
 
   # Actually run the tests.
   if len(attached_devices) > 1 and options.wait_for_debugger:
     logging.warning('Debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
   logging.debug('Running Python tests')
   sharder = PythonTestSharder(attached_devices, available_tests, options)
   test_results = sharder.RunShardedTests()
 
   return test_results
 
 
+def Dispatch(options):
+  """Wraps DispatchPythonTests to log and return the number of failed tests."""
+
+  results = DispatchPythonTests(options)
+  report_results.LogFull(
+      results=results,
+      test_type='HostDriven',
+      test_package=os.path.basename(options.test_apk),
+      annotation=options.annotations,
+      build_type=options.build_type,
+      flakiness_server=options.flakiness_dashboard_server)
+  return len(results.GetNotPass())
+
+
 def _GetTestModules(python_test_root, is_official_build):
   """Retrieve a sorted list of pythonDrivenTests.
 
   Walks the location of pythonDrivenTests, imports them, and provides the list
   of imported modules to the caller.
 
   Args:
     python_test_root: the path to walk, looking for pythonDrivenTests
     is_official_build: whether to run only those tests marked 'official'
 
@@ skipping 84 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