[Android] Redesigns the sharder to allow replicated vs distributed tests

build/android/pylib/instrumentation/test_runner.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.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import shutil
@@ skipping 34 matching lines @@
 
 class TestRunner(base_test_runner.BaseTestRunner):
   """Responsible for running a series of tests connected to a single device."""
 
   _DEVICE_DATA_DIR = 'chrome/test/data'
   _HOSTMACHINE_PERF_OUTPUT_FILE = '/tmp/chrome-profile'
   _DEVICE_PERF_OUTPUT_SEARCH_PREFIX = (constants.DEVICE_PERF_OUTPUT_DIR +
                                        '/chrome-profile*')
   _DEVICE_HAS_TEST_FILES = {}
 
-  def __init__(self, options, device, shard_index, test_pkg, ports_to_forward):
+  def __init__(self, build_type, test_data, install_apk, save_perf_json,

[frankf, 2013/07/16 00:02:18]

For ever function signature you modify, make sure there are no dependencies
downstream.

+               screenshot_failures, tool, wait_for_debugger, disable_assertions,
+               push_deps, device, shard_index, test_pkg, ports_to_forward):
     """Create a new TestRunner.
 
     Args:
-      options: An options object with the following required attributes:
-      -  build_type: 'Release' or 'Debug'.
-      -  install_apk: Re-installs the apk if opted.
-      -  save_perf_json: Whether or not to save the JSON file from UI perf
-            tests.
-      -  screenshot_failures: Take a screenshot for a test failure
-      -  tool: Name of the Valgrind tool.
-      -  wait_for_debugger: blocks until the debugger is connected.
-      -  disable_assertions: Whether to disable java assertions on the device.
-      -  push_deps: If True, push all dependencies to the device.
+      build_type: 'Release' or 'Debug'.
+      test_data: Location of the test data.
+      install_apk: Re-installs the apk if opted.
+      save_perf_json: Whether or not to save the JSON file from UI perf tests.
+      screenshot_failures: Take a screenshot for a test failure
+      tool: Name of the Valgrind tool.
+      wait_for_debugger: blocks until the debugger is connected.
+      disable_assertions: Whether to disable java assertions on the device.
+      push_deps: If True, push all dependencies to the device.
       device: Attached android device.
       shard_index: Shard index.
       test_pkg: A TestPackage object.
       ports_to_forward: A list of port numbers for which to set up forwarders.
                         Can be optionally requested by a test case.
     """
-    super(TestRunner, self).__init__(device, options.tool, options.build_type,
-                                     options.push_deps)
+    super(TestRunner, self).__init__(device, tool, build_type, push_deps)
     self._lighttp_port = constants.LIGHTTPD_RANDOM_PORT_FIRST + shard_index
 
-    self.build_type = options.build_type
-    self.test_data = options.test_data
-    self.save_perf_json = options.save_perf_json
-    self.screenshot_failures = options.screenshot_failures
-    self.wait_for_debugger = options.wait_for_debugger
-    self.disable_assertions = options.disable_assertions
+    self.build_type = build_type
+    self.test_data = test_data
+    self.save_perf_json = save_perf_json
+    self.screenshot_failures = screenshot_failures
+    self.wait_for_debugger = wait_for_debugger
+    self.disable_assertions = disable_assertions
     self.test_pkg = test_pkg
     self.ports_to_forward = ports_to_forward
-    self.install_apk = options.install_apk
+    self.install_apk = install_apk
 
   #override
   def InstallTestPackage(self):
     if self.install_apk:
       self.test_pkg.Install(self.adb)
 
   #override
   def PushDataDeps(self):
     # TODO(frankf): Implement a general approach for copying/installing
     # once across test runners.
@@ skipping 251 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)