WebRTC: Use Chromium's GTestTest for Android

scripts/slave/recipe_modules/webrtc/steps.py

Index: scripts/slave/recipe_modules/webrtc/steps.py
diff --git a/scripts/slave/recipe_modules/webrtc/steps.py b/scripts/slave/recipe_modules/webrtc/steps.py
index fefb8c4f4e19636d29435ed534c6d40ef5272eb0..a64e9184858ea52a23469f192e9bdb82b07d46ca 100644
--- a/scripts/slave/recipe_modules/webrtc/steps.py
+++ b/scripts/slave/recipe_modules/webrtc/steps.py
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import DEPS
+GTestTest = DEPS['chromium_tests'].steps.GTestTest
 
 def generate_tests(api, test_suite, revision, enable_swarming=False):

[iannucci, 2016/10/24 17:25:20]

I think that api.chromium_tests.steps.GTestTest would be the same object, and
wouldn't require your import hack.

   tests = []
@@ -47,7 +49,8 @@ def generate_tests(api, test_suite, revision, enable_swarming=False):
   elif test_suite == 'android_swarming':
     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))
 
@@ -63,18 +66,6 @@ class Test(object):
     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()
 
@@ -91,7 +82,10 @@ class Test(object):
       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."""
@@ -110,7 +104,6 @@ class WebRTCTest(Test):
                  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):