WebRTC: Add android_junit_tests.

scripts/slave/recipe_modules/webrtc/api.py

Index: scripts/slave/recipe_modules/webrtc/api.py
diff --git a/scripts/slave/recipe_modules/webrtc/api.py b/scripts/slave/recipe_modules/webrtc/api.py
index b953f07e58ea870cdbd562cea7c527fbcf56b543..d5b5f24891b8329a3b2e30326a35ffb74d7dc764 100644
--- a/scripts/slave/recipe_modules/webrtc/api.py
+++ b/scripts/slave/recipe_modules/webrtc/api.py
@@ -71,7 +71,8 @@ class WebRTCApi(recipe_api.RecipeApi):
 
   @property
   def should_test(self):
-    return self.bot_type in ('tester', 'builder_tester')
+    return (self.bot_type in ('tester', 'builder_tester') or
+            self.additional_tests)

[kjellander_chromium, 2016/09/23 19:24:24]

Since a 'builder_tester' can both build (+upload to google storage) and test. I
think we should convert these bots to builder_testers instead of adding this
additional configuration of 'additional_tests'

 
   @property
   def should_upload_build(self):
@@ -99,8 +100,12 @@ class WebRTCApi(recipe_api.RecipeApi):
         'Cannot find recipe_config "%s" for builder "%r".' %
         (recipe_config_name, self.buildername))
 
-    self.set_config('webrtc', PERF_CONFIG=perf_config,
-                    TEST_SUITE=self.recipe_config.get('test_suite'),
+    self.additional_tests = self.bot_config.get('additional_tests', {})
+
+    test_suite = 'none'
+    if self.bot_type in ('tester', 'builder_tester'):
+      test_suite = self.recipe_config.get('test_suite')
+    self.set_config('webrtc', PERF_CONFIG=perf_config, TEST_SUITE=test_suite,
                     **self.bot_config.get('webrtc_config_kwargs', {}))
 
     chromium_kwargs = self.bot_config.get('chromium_config_kwargs', {})
@@ -128,10 +133,13 @@ class WebRTCApi(recipe_api.RecipeApi):
     self.c.enable_swarming = self.bot_config.get('enable_swarming')
     if self.c.use_isolate:
       self.m.isolate.set_isolate_environment(self.m.chromium.c)
+      self._isolated_targets = tuple()
+      for test_type in self.additional_tests.values():
+        self._isolated_targets += tuple(test_type)
       if self.c.TEST_SUITE == 'webrtc':
-        self._isolated_targets = self.NORMAL_TESTS
+        self._isolated_targets += self.NORMAL_TESTS
       elif self.c.TEST_SUITE == 'android':
-        self._isolated_targets = (self.ANDROID_APK_TESTS +
+        self._isolated_targets += (self.ANDROID_APK_TESTS +
             self.ANDROID_INSTRUMENTATION_TESTS)

[kjellander_chromium, 2016/09/23 19:24:24]

+ ('android_junit_tests'),

       else: # pragma: no cover
         raise self.m.step.StepFailure('Isolation and swarming are only '