Make android's run_instrumentation_suite() use generated wrapper scripts

scripts/slave/recipe_modules/chromium_tests/steps.py

 # Copyright 2014 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.
 
 import re
 import string
 
 
 class Test(object):
   """
@@ skipping 466 matching lines @@
         swarming_dimension_sets = swarming_spec.get('dimension_sets')
         swarming_priority = swarming_spec.get('priority_adjustment')
         swarming_expiration = swarming_spec.get('expiration')
     if use_swarming and swarming_dimension_sets:
       for dimensions in swarming_dimension_sets:
         # TODO(stip): Swarmify instrumentation tests
         pass
     else:
       yield AndroidInstrumentationTest(
           test_name,
-          compile_targets=test.get('override_compile_targets', None),
-          isolate_file_path=test.get('isolate_file_path', None),
-          apk_under_test=test.get('apk_under_test', None),
-          test_apk=test.get('test_apk', None),
-          additional_apks=test.get('additional_apks', None))
+          compile_targets=test.get('override_compile_targets', None))
 
 
 def generate_script(api, chromium_tests_api, mastername, buildername, test_spec,
                     bot_update_step, enable_swarming=False,
                     swarming_dimensions=None, scripts_compile_targets=None):
   for script_spec in test_spec.get(buildername, {}).get('scripts', []):
     yield ScriptTest(
         str(script_spec['name']),
         script_spec['script'],
         scripts_compile_targets,
@@ skipping 564 matching lines @@
         test_apk=self.name,
         isolate_file_path=isolate_file_path,
         timeout_scale=self._test_timeout_scale)
 
   #override
   def run_test_locally(self, api, suffix):
     isolate_file_path = (api.path['checkout'].join(self._android_isolate_path)
                          if self._android_isolate_path else None)
     return AndroidInstrumentationTest(
         name=self.name,
-        compile_targets=self._compile_target,
-        apk_under_test=self._apk_under_test,
-        test_apk=self.name,
-        isolate_file_path=isolate_file_path,
+        compile_targets=[self._compile_target],
         timeout_scale=self._test_timeout_scale).run(api, suffix)
 
 
 class LocalIsolatedScriptTest(Test):
   def __init__(self, name, args=None, target_name=None,
                override_compile_targets=None, **runtest_kwargs):
     """Constructs an instance of LocalIsolatedScriptTest.
 
     An LocalIsolatedScriptTest knows how to invoke an isolate which obeys a
     certain contract. The isolate's main target must be a wrapper script which
@@ skipping 476 matching lines @@
     api.chromium_android.run_java_unit_test_suite(
         self.name, verbose=True, suffix=suffix,
         json_results_file=json_results_file,
         step_test_data=lambda: api.json.test_api.output(mock_test_results))
 
 
 class AndroidInstrumentationTest(AndroidTest):
   _DEFAULT_SUITES = {
     'AndroidWebViewTest': {
       'compile_target': 'android_webview_test_apk',
-      'isolate_file_path': 'android_webview/android_webview_test_apk.isolate',
-      'apk_under_test': 'AndroidWebView.apk',
-      'test_apk': 'AndroidWebViewTest.apk',
     },
     'ChromePublicTest': {
       'compile_target': 'chrome_public_test_apk',
-      'isolate_file_path': 'chrome/chrome_public_test_apk.isolate',
-      'apk_under_test': 'ChromePublic.apk',
-      'test_apk': 'ChromePublicTest.apk',
-      'additional_apks': [
-        'ChromePublicTestSupport.apk',
-        'ChromiumNetTestSupport.apk',
-      ],
     },
     'ChromeSyncShellTest': {
       'compile_target': 'chrome_sync_shell_test_apk',
-      'isolate_file_path': None,
-      'apk_under_test': 'ChromeSyncShell.apk',
-      'test_apk': 'ChromeSyncShellTest.apk',
     },
     'ChromotingTest': {
       'compile_target': 'remoting_test_apk',
-      'isolate_file_path': None,
-      'apk_under_test': 'Chromoting.apk',
-      'test_apk': 'ChromotingTest.apk',
     },
     'ContentShellTest': {
       'compile_target': 'content_shell_test_apk',
-      'isolate_file_path': 'content/content_shell_test_apk.isolate',
-      'apk_under_test': 'ContentShell.apk',
-      'test_apk': 'ContentShellTest.apk',
     },
     'SystemWebViewShellLayoutTest': {
       'compile_target': 'system_webview_shell_layout_test_apk',
+      # TODO(agrieve): These should be listed as deps for
+      #     system_webview_shell_layout_test_apk.
       'additional_compile_targets': [
         'system_webview_apk',
         'system_webview_shell_apk',
         'android_tools'
       ],
-      'isolate_file_path': ('android_webview/'
-                            'system_webview_shell_test_apk.isolate'),
-      'apk_under_test': 'SystemWebViewShell.apk',
-      'test_apk': 'SystemWebViewShellLayoutTest.apk',
-      'additional_apks': ['SystemWebView.apk'],
     },
     'MojoTest': {
       'compile_target': 'mojo_test_apk',
-      'isolate_file_path': None,
-      'apk_under_test': None,
-      'test_apk': 'MojoTest.apk',
     }
   }
 
   _DEFAULT_SUITES_BY_TARGET = {
     'android_webview_test_apk': _DEFAULT_SUITES['AndroidWebViewTest'],
     'chrome_public_test_apk': _DEFAULT_SUITES['ChromePublicTest'],
     'chrome_sync_shell_test_apk': _DEFAULT_SUITES['ChromeSyncShellTest'],
     'content_shell_test_apk': _DEFAULT_SUITES['ContentShellTest'],
     'mojo_test_apk': _DEFAULT_SUITES['MojoTest'],
     'remoting_test_apk': _DEFAULT_SUITES['ChromotingTest'],
@@ skipping 26 matching lines @@
     self._apk_under_test = (
         apk_under_test or suite_defaults.get('apk_under_test'))
     self._except_annotation = except_annotation
     self._flakiness_dashboard = flakiness_dashboard
     self._host_driven_root = host_driven_root
     self._screenshot = screenshot
     self._test_apk = test_apk or suite_defaults.get('test_apk')
     self._timeout_scale = timeout_scale
     self._tool = tool
     self._verbose = verbose
+    self._wrapper_script_suite_name = compile_targets[0]
+
 
   #override
   def run_tests(self, api, suffix, json_results_file):
     mock_test_results = {
       'per_iteration_data': [{'TestA': [{'status': 'SUCCESS'}]},
                              {'TestB': [{'status': 'FAILURE'}]}]
     }
     api.chromium_android.run_instrumentation_suite(
         self.name,
         test_apk=api.chromium_android.apk_path(self._test_apk),
         apk_under_test=api.chromium_android.apk_path(self._apk_under_test),
         additional_apks=[
             api.chromium_android.apk_path(a)
             for a in self._additional_apks or []],
         suffix=suffix,
         isolate_file_path=self.isolate_file_path,
         flakiness_dashboard=self._flakiness_dashboard,
         annotation=self._annotation, except_annotation=self._except_annotation,
         screenshot=self._screenshot, verbose=self._verbose, tool=self._tool,
         host_driven_root=self._host_driven_root,
         json_results_file=json_results_file,
         timeout_scale=self._timeout_scale,
+        wrapper_script_suite_name=self._wrapper_script_suite_name,
         step_test_data=lambda: api.json.test_api.output(mock_test_results))
 
 
 class BlinkTest(Test):
   # TODO(dpranke): This should be converted to a PythonBasedTest, although it
   # will need custom behavior because we archive the results as well.
   def __init__(self, extra_args=None):
     super(BlinkTest, self).__init__()
     self._extra_args = extra_args
 
@@ skipping 197 matching lines @@
   def run(self, api, suffix, test_filter=None):
     api.chromium_android.coverage_report(upload=False)
     api.chromium_android.get_changed_lines_for_revision()
     api.chromium_android.incremental_coverage_report()
 
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]