WebRTC: Add android_junit_tests.

scripts/slave/recipe_modules/webrtc/api.py

 # Copyright 2013 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.
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 from . import builders
 from . import steps
 
 
@@ skipping 53 matching lines @@
   )
 
   DASHBOARD_UPLOAD_URL = 'https://chromeperf.appspot.com'
 
   @property
   def should_build(self):
     return self.bot_type in ('builder', 'builder_tester')
 
   @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):
     return self.bot_config.get('triggers')
 
   @property
   def should_download_build(self):
     return self.bot_config.get('parent_buildername')
 
   def apply_bot_config(self, builders, recipe_configs, perf_config=None):
     self.mastername = self.m.properties.get('mastername')
     self.buildername = self.m.properties.get('buildername')
     master_dict = builders.get(self.mastername, {})
     self.master_config = master_dict.get('settings', {})
     perf_config = self.master_config.get('PERF_CONFIG')
 
     self.bot_config = master_dict.get('builders', {}).get(self.buildername)
     assert self.bot_config, ('Unrecognized builder name "%r" for master "%r".' %
                              (self.buildername, self.mastername))
 
     self.bot_type = self.bot_config.get('bot_type', 'builder_tester')
     recipe_config_name = self.bot_config['recipe_config']
     self.recipe_config = recipe_configs.get(recipe_config_name)
     assert self.recipe_config, (
         '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', {})
     if self.recipe_config.get('chromium_android_config'):
       self.m.chromium_android.set_config(
           self.recipe_config['chromium_android_config'], **chromium_kwargs)
 
     self.m.chromium.set_config(self.recipe_config['chromium_config'],
                                **chromium_kwargs)
     self.m.gclient.set_config(self.recipe_config['gclient_config'])
 
     # Support applying configs both at the bot and the recipe config level.
     for c in self.bot_config.get('chromium_apply_config', []):
       self.m.chromium.apply_config(c)
     for c in self.bot_config.get('gclient_apply_config', []):
       self.m.gclient.apply_config(c)
     for c in self.recipe_config.get('gclient_apply_config', []):
       self.m.gclient.apply_config(c)
 
     if self.m.tryserver.is_tryserver:
       self.m.chromium.apply_config('trybot_flavor')
 
   def configure_swarming(self):
     self.c.use_isolate = self.bot_config.get('use_isolate')
     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 '
                                       'supported for webrtc and android test '
                                       'suites.')
 
     self.c.enable_swarming = self.bot_config.get('enable_swarming')
     if self.c.enable_swarming:
       self.m.chromium_swarming.configure_swarming(
           'webrtc',
           precommit=self.m.tryserver.is_tryserver,
@@ skipping 195 matching lines @@
   def clean_test_output(self):
     """Remove all test output in out/, since we have tests leaking files."""
     out_dir = self.m.path['checkout'].join('out')
     self.m.python('clean test output files',
                   script=self.resource('cleanup_files.py'),
                   args=[out_dir],
                   infra_step=True)
 
   def virtual_webcam_check(self):
     self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py'))