WebRTC: Use Chromium's GTestTest for Android

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()):
       tests.append(WebRTCTest(test, enable_swarming=enable_swarming,
                               revision=revision, **extra_args))
   elif test_suite == 'webrtc_baremetal':
     if api.m.platform.is_linux:
       f = api.m.path['checkout'].join
@@ skipping 16 matching lines @@
         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_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':
+    GTestTest = api.m.chromium_tests.steps.GTestTest
     for test in (api.ANDROID_DEVICE_TESTS +
                  api.ANDROID_INSTRUMENTATION_TESTS):
-      tests.append(Test(test, enable_swarming=enable_swarming))
+      tests.append(GTestTest(test, enable_swarming=enable_swarming,
+                             override_isolate_target=test))
     for test in api.ANDROID_JUNIT_TESTS:
       tests.append(AndroidJunitTest(test))
 
   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, swarming_shards=1):
     self._name = name
     self._enable_swarming = enable_swarming
     self._swarming_task = None
     self._swarming_shards = swarming_shards
 
-  @property
-  def name(self):  # pragma: no cover
-    return self._name
-
-  @property
-  def enable_swarming(self):
-    return self._enable_swarming
-
-  @property
-  def swarming_task(self):
-    return self._swarming_task
-
   def run_nonswarming(self, api, suffix): # pragma: no cover:
     raise NotImplementedError()
 
   def pre_run(self, api, suffix):
     return []
 
   def run(self, api, suffix):
     if self._enable_swarming:
       isolated_hash = api.m.isolate.isolated_tests[self._name]
       self._swarming_task = api.m.swarming.task(self._name, isolated_hash,
                                                 shards=self._swarming_shards)
       api.m.swarming.trigger_task(self._swarming_task)
     else:
       self.run_nonswarming(api, suffix)
 
   def post_run(self, api, suffix):
-    return []
+    if self._enable_swarming:
+      api.swarming.collect_task(self._swarming_task)
+    else:
+      return []
 
 class WebRTCTest(Test):
   """A normal WebRTC desktop test."""
   def __init__(self, name, revision=None, enable_swarming=False,
                swarming_shards=1, parallel=True, perf_test=False,
                **runtest_kwargs):
     super(WebRTCTest, self).__init__(name, enable_swarming, swarming_shards)
     self._revision = revision
     self._parallel = parallel
     self._perf_test = perf_test
     self._runtest_kwargs = runtest_kwargs
 
   def run_nonswarming(self, api, suffix):
     self._runtest_kwargs['test'] = self._name
     api.add_test(name=self._name, revision=self._revision,
                  parallel=self._parallel, perf_test=self._perf_test,
                  **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)
 
 class AndroidJunitTest(Test):
   """Runs an Android Junit test."""
 
@@ skipping 22 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)