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): Are these needed?

[jbudorick, 2016/04/02 00:59:57]

iirc yes

[agrieve, 2016/04/05 02:37:01]

Updated comment to say that system_webview_shell_layout_test_apk should list
them as deps

       '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'],
     'system_webview_shell_layout_test_apk':
         _DEFAULT_SUITES['SystemWebViewShellLayoutTest'],
   }
 
   def __init__(self, name, compile_targets=None, apk_under_test=None,
                test_apk=None, isolate_file_path=None, timeout_scale=None,
                flakiness_dashboard='test-results.appspot.com',
                annotation=None, except_annotation=None, screenshot=False,
                verbose=True, tool=None, host_driven_root=None,
                additional_apks=None):
     suite_defaults = (
         AndroidInstrumentationTest._DEFAULT_SUITES.get(name)
         or AndroidInstrumentationTest._DEFAULT_SUITES_BY_TARGET.get(name)
         or {})
     if not compile_targets:
       compile_targets = [suite_defaults['compile_target']]
       compile_targets.extend(
           suite_defaults.get('additional_compile_targets', []))
+    # Normalize the name to be the compile target.
+    name = compile_targets[0]
 
     super(AndroidInstrumentationTest, self).__init__(
         name,
         compile_targets,
         isolate_file_path or suite_defaults.get('isolate_file_path'))
     self._additional_apks = (
         additional_apks or suite_defaults.get('additional_apks'))
     self._annotation = annotation
     self._apk_under_test = (
         apk_under_test or suite_defaults.get('apk_under_test'))
@@ skipping 237 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'),
 ]