WebRTC: Move Android bots with devices to the perf waterfall.

scripts/slave/recipe_modules/webrtc/steps.py

 # Copyright 2015 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.
 
 
 def generate_tests(api, test_suite, revision, enable_swarming=False):
   tests = []
 
   if test_suite == 'webrtc':
     for test, extra_args in sorted(api.NORMAL_TESTS.items()):
@@ skipping 21 matching lines @@
     # http://crbug.com/589101
     if api.m.platform.is_mac or api.m.platform.is_win:
       tests.append(BaremetalTest('audio_device_tests', revision))
 
     tests.extend([
         BaremetalTest('voe_auto_test', revision, args=['--automated']),
         BaremetalTest('video_capture_tests', revision),
     ])
     if not api.m.tryserver.is_tryserver:
       tests.append(BaremetalTest('webrtc_perf_tests', revision, perf_test=True))
-  elif test_suite == 'android_swarming' or test_suite == 'android_perf':
-    for test, extra_args in sorted(api.ANDROID_DEVICE_TESTS.items()):
-      tests.append(AndroidTest(test, enable_swarming, **extra_args))
-    if (test_suite == 'android_perf' and not api.m.tryserver.is_tryserver
-        and api.c.PERF_ID and api.m.chromium.c.BUILD_CONFIG == 'Release'):
-      tests.append(AndroidPerfTest('webrtc_perf_tests', revision,
-                                   perf_id=api.c.PERF_ID))
-    for test, extra_args in sorted(api.ANDROID_INSTRUMENTATION_TESTS.items()):
-      tests.append(AndroidInstrumentationTest(test, enable_swarming,
-                                              **extra_args))
-  if test_suite == 'android_swarming':
+  elif (test_suite == 'android_perf' and not api.m.tryserver.is_tryserver
+      and api.c.PERF_ID and api.m.chromium.c.BUILD_CONFIG == 'Release'):
+    tests.append(AndroidPerfTest('webrtc_perf_tests', revision,
+                                 perf_id=api.c.PERF_ID))
+  elif test_suite == 'android_swarming':
+    for test, extra_args in (sorted(api.ANDROID_DEVICE_TESTS.items()) +
+                             sorted(api.ANDROID_INSTRUMENTATION_TESTS.items())):
+      tests.append(Test(test, enable_swarming, **extra_args))
     for test, extra_args in sorted(api.ANDROID_JUNIT_TESTS.items()):
       tests.append(AndroidJunitTest(test, False, **extra_args))
 
   return tests
 
 
 # TODO(kjellander): Continue refactoring an integrate the classes in the
 # chromium_tests recipe module instead (if possible).
 class Test(object):
   def __init__(self, name, enable_swarming=False, shards=1):
@@ skipping 43 matching lines @@
                  **self._runtest_kwargs)
 
 
 class BaremetalTest(WebRTCTest):
   """A WebRTC desktop test that uses audio and/or video devices."""
   def __init__(self, name, revision, perf_test=False, **runtest_kwargs):
     # Tests accessing hardware devices shouldn't be run in parallel.
     super(BaremetalTest, self).__init__(name, revision, parallel=False,
                                         perf_test=perf_test, **runtest_kwargs)
 
-
-def get_android_tool(api):
-  if api.m.chromium.c.gyp_env.GYP_DEFINES.get('asan', 0) == 1:
-    return 'asan'
-  return None
-
-
-class AndroidTest(Test):
-  """Runs a simple Android test."""
-
-  def run_nonswarming(self, api, suffix):
-    api.m.chromium_android.run_test_suite(self._name,
-                                          tool=get_android_tool(api))
-
-
-class AndroidInstrumentationTest(Test):
-  """Installs the APK on the device and runs the test."""
-
-  def run_nonswarming(self, api, suffix):
-    api.m.chromium_android.run_instrumentation_suite(
-        name=self._name,
-        wrapper_script_suite_name=self._name,
-        tool=get_android_tool(api),
-        verbose=True)
-
 class AndroidJunitTest(Test):
   """Runs an Android Junit test."""
 
   def run_nonswarming(self, api, suffix):
     api.m.chromium_android.run_java_unit_test_suite(self._name)
 
 class AndroidPerfTest(Test):
   """A performance test to run on Android devices.
 
     Basically just wrap what happens in chromium_android.run_test_suite to run
@@ skipping 15 matching lines @@
                                                     'run_%s' % self._name)
     args = ['--verbose']
     api.add_test(name=self._name,
                  test=wrapper_script,
                  args=args,
                  revision=self._revision,
                  python_mode=True,
                  perf_test=True,
                  perf_dashboard_id=self._name)