[Android] Converts host driven tests to common test_dispatcher

build/android/pylib/host_driven/instrumentation_test_case.py

Index: build/android/pylib/host_driven/instrumentation_test_case.py
diff --git a/build/android/pylib/host_driven/python_test_base.py b/build/android/pylib/host_driven/instrumentation_test_case.py
similarity index 30%
rename from build/android/pylib/host_driven/python_test_base.py
rename to build/android/pylib/host_driven/instrumentation_test_case.py
index 9d8f8faeb429ff4a3907ed5f87ef58f284bc9347..9f320609aebb49ee102931f3dbbe3ef39726556b 100644
--- a/build/android/pylib/host_driven/python_test_base.py
+++ b/build/android/pylib/host_driven/instrumentation_test_case.py
@@ -1,96 +1,90 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# 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.
 
-"""Base class for Android Python-driven tests.
+"""Base class for host-driven instrumentation tests.
 
-This test case is intended to serve as the base class for any Python-driven
-tests. It is similar to the Python unitttest module in that the user's tests
-inherit from this case and add their tests in that case.
-
-When a PythonTestBase object is instantiated, its purpose is to run only one of
-its tests. The test runner gives it the name of the test the instance will
-run. The test runner calls SetUp with the Android device ID which the test will
-run against. The runner runs the test method itself, collecting the result,
-and calls TearDown.
-
-Tests can basically do whatever they want in the test methods, such as call
-Java tests using _RunJavaTests. Those methods have the advantage of massaging
-the Java test results into Python test results.
+This test case serves as the base class for any host-driven instrumentation
+tests. Each test method in the derived class can call _RunJavaTests to run
+instrumentation tests on the corresponding device via an instrumentation test
+runner.
 """
 
-import logging
 import os
 import time
 
-from pylib import android_commands
 from pylib.base import base_test_result
 from pylib.instrumentation import test_package
 from pylib.instrumentation import test_result
 from pylib.instrumentation import test_runner
 
+import test_case
 
 # aka the parent of com.google.android
 BASE_ROOT = 'src' + os.sep
 
 
-class PythonTestBase(object):
-  """Base class for Python-driven tests."""
-
-  def __init__(self, test_name):
-    # test_name must match one of the test methods defined on a subclass which
-    # inherits from this class.
-    # It's stored so we can do the attr lookup on demand, allowing this class
-    # to be pickled, a requirement for the multiprocessing module.
-    self.test_name = test_name
-    class_name = self.__class__.__name__
-    self.qualified_name = class_name + '.' + self.test_name
+class InstrumentationHostDrivenTestCase(test_case.HostDrivenTestCase):
+  """Base class for host-driven instrumentation test cases.
 
-  def SetUp(self, options):
-    self.options = options
-    self.shard_index = self.options.shard_index
-    self.device_id = self.options.device_id
-    self.adb = android_commands.AndroidCommands(self.device_id)
-    self.ports_to_forward = []
+  Raises:
+    WaitForResponseTimedOutError: If timeout occurred while waiting for
+        response to adb instrument command.
+    DeviceUnresponsiveError: If device system process is not responding.
+    InstrumentationError: If instrumentation failed to run.
+  """
 
-  def TearDown(self):
-    pass
+  def __init__(self, test_name, test_apk_path, test_apk_jar_path,
+               test_data, install_apk, save_perf_json, screenshot_failures,
+               tool, wait_for_debugger, disable_assertions):
+    """Create an InstrumentationHostDrivenTestCase object.
 
-  def GetOutDir(self):
-    return os.path.join(os.environ['CHROME_SRC'], 'out',
-        self.options.build_type)
+    Args:
+      test_name: The name of the method to run as the test.
+      test_apk_path: Path to the test apk file.
+      test_apk_jar_path: Path to the accompanying jar file.
+      other args: All passed through to the instrumentation test runner. See the
+          test runner docs for details.
+    """
 
-  def Run(self):
-    logging.warning('Running Python-driven test: %s', self.test_name)
-    return getattr(self, self.test_name)()
+    super(InstrumentationHostDrivenTestCase, self).__init__(test_name)
+    self.test_apk_path = test_apk_path
+    self.test_apk_jar_path = test_apk_jar_path
+    self.test_data = test_data
+    self.install_apk = install_apk
+    self.save_perf_json = save_perf_json
+    self.screenshot_failures = screenshot_failures
+    self.wait_for_debugger = wait_for_debugger
+    self.tool = tool
+    self.disable_assertions = disable_assertions
 
   def _RunJavaTest(self, fname, suite, test):
-    """Runs a single Java test with a Java TestRunner.
+    """Runs a single Java test method with a Java TestRunner.
 
     Args:
-      fname: filename for the test (e.g. foo/bar/baz/tests/FooTest.py)
-      suite: name of the Java test suite (e.g. FooTest)
-      test: name of the test method to run (e.g. testFooBar)
+      fname: Filename for the host-driven test case
+          (e.g. foo/bar/baz/tests/FooTest.py)
+      suite: Name of the Java test suite (e.g. FooTest)

[frankf, 2013/07/25 22:50:06]

suite -> class

[gkanwar1, 2013/07/26 01:39:06]

Done.

+      test: Name of the test method to run (e.g. testFooBar)
 
     Returns:
       TestRunResults object with a single test result.
     """
     test = self._ComposeFullTestName(fname, suite, test)
     test_pkg = test_package.TestPackage(
-        self.options.test_apk_path, self.options.test_apk_jar_path)
-    java_test_runner = test_runner.TestRunner(self.options.build_type,
-                                              self.options.test_data,
-                                              self.options.install_apk,
-                                              self.options.save_perf_json,
-                                              self.options.screenshot_failures,
-                                              self.options.tool,
-                                              self.options.wait_for_debugger,
-                                              self.options.disable_assertions,
-                                              self.options.push_deps,
-                                              self.options.cleanup_test_files,
+        self.test_apk_path, self.test_apk_jar_path)
+    java_test_runner = test_runner.TestRunner(self.build_type,
+                                              self.test_data,
+                                              self.install_apk,
+                                              self.save_perf_json,
+                                              self.screenshot_failures,
+                                              self.tool,
+                                              self.wait_for_debugger,
+                                              self.disable_assertions,
+                                              self.push_deps,
+                                              self.cleanup_test_files,
                                               self.device_id,
-                                              self.shard_index, test_pkg,
-                                              self.ports_to_forward)
+                                              self.shard_index, test_pkg, [])
     try:
       java_test_runner.SetUp()
       return java_test_runner.RunTest(test)[0]
@@ -101,14 +95,15 @@ class PythonTestBase(object):
     """Calls a list of tests and stops at the first test failure.
 
     This method iterates until either it encounters a non-passing test or it
-    exhausts the list of tests. Then it returns the appropriate Python result.
+    exhausts the list of tests. Then it returns the appropriate overall result.
 
     Args:
-      fname: filename for the Python test
-      tests: a list of Java test names which will be run
+      fname: Filename for the host-driven test case
+      tests: A list of Java test names which will be run
 
     Returns:
-      A TestRunResults object containing a result for this Python test.
+      A TestRunResults object containing an overall result for this set of Java
+      tests. If any Java tests do not pass, this is a fail overall.
     """
     test_type = base_test_result.ResultType.PASS
     log = ''
@@ -118,27 +113,24 @@ class PythonTestBase(object):
       # We're only running one test at a time, so this TestRunResults object
       # will hold only one result.
       suite, test_name = test.split('.')
-      java_results = self._RunJavaTest(fname, suite, test_name)
-      assert len(java_results.GetAll()) == 1
-      if not java_results.DidRunPass():
-        result = java_results.GetNotPass().pop()
+      java_result = self._RunJavaTest(fname, suite, test_name)
+      assert len(java_result.GetAll()) == 1
+      if not java_result.DidRunPass():
+        result = java_result.GetNotPass().pop()
         log = result.GetLog()
         test_type = result.GetType()
         break
     duration_ms = int(time.time()) * 1000 - start_ms
 
-    python_results = base_test_result.TestRunResults()
-    python_results.AddResult(
+    overall_result = base_test_result.TestRunResults()
+    overall_result.AddResult(
         test_result.InstrumentationTestResult(
-            self.qualified_name, test_type, start_ms, duration_ms, log=log))
-    return python_results
-
-  def _ComposeFullTestName(self, fname, suite, test):
-    package_name = self._GetPackageName(fname)
-    return package_name + '.' + suite + '#' + test
+            self.tagged_name, test_type, start_ms, duration_ms, log=log))
+    return overall_result
 
-  def _GetPackageName(self, fname):
-    """Extracts the package name from the test file path."""
+  def _ComposeFullTestName(self, fname, test_case, method):
+    """Composes a fully-qualified name for the test method."""

[frankf, 2013/07/25 22:50:06]

Specify args/return, provide examples

[gkanwar1, 2013/07/26 01:39:06]

Done.

     dirname = os.path.dirname(fname)
     package = dirname[dirname.rfind(BASE_ROOT) + len(BASE_ROOT):]
-    return package.replace(os.sep, '.')
+    package_name = package.replace(os.sep, '.')
+    return package_name + '.' + test_case + '#' + method