WebRTC: Make WebRTC's Test more similar to Chromium's GTestTest

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 e4f17f90f7af72d3d51767a137df635752d91d02..e8d738820ecb91dbfb14570adc779c574920e8e2 100644
--- a/scripts/slave/recipe_modules/webrtc/api.py
+++ b/scripts/slave/recipe_modules/webrtc/api.py
@@ -26,25 +26,25 @@ class WebRTCApi(recipe_api.RecipeApi):
     'common_audio_unittests': {},
     'common_video_unittests': {},
     'modules_tests': {
-      'shards': 2,
+      'swarming_shards': 2,
     },
     'modules_unittests': {
-      'shards': 6,
+      'swarming_shards': 6,
     },
     'peerconnection_unittests': {
-      'shards': 4,
+      'swarming_shards': 4,
     },
     'rtc_media_unittests': {},
     'rtc_pc_unittests': {},
     'rtc_stats_unittests': {},
     'rtc_unittests': {
-      'shards': 6,
+      'swarming_shards': 6,
     },
     'system_wrappers_unittests': {},
     'test_support_unittests': {},
     'tools_unittests': {},
     'video_engine_tests': {
-      'shards': 4,
+      'swarming_shards': 4,
     },
     'voice_engine_unittests': {},
     'webrtc_nonparallel_tests': {
@@ -53,31 +53,31 @@ class WebRTCApi(recipe_api.RecipeApi):
     'xmllite_xmpp_unittests': {},
   })
 
-  ANDROID_DEVICE_TESTS = freeze({
-    'audio_decoder_unittests': {},
-    'common_audio_unittests': {},
-    'common_video_unittests': {},
-    'modules_tests': {},
-    'modules_unittests': {},
-    'peerconnection_unittests': {},
-    'rtc_stats_unittests': {},
-    'rtc_unittests': {},
-    'system_wrappers_unittests': {},
-    'test_support_unittests': {},
-    'tools_unittests': {},
-    'video_engine_tests': {},
-    'voice_engine_unittests': {},
-    'webrtc_nonparallel_tests': {},
-  })
-
-  ANDROID_INSTRUMENTATION_TESTS = freeze({
-    'AppRTCMobileTest': {},
-    'libjingle_peerconnection_android_unittest': {},
-  })
-
-  ANDROID_JUNIT_TESTS = freeze({
-    'android_junit_tests': {},
-  })
+  ANDROID_DEVICE_TESTS = (
+    'audio_decoder_unittests',
+    'common_audio_unittests',
+    'common_video_unittests',
+    'modules_tests',
+    'modules_unittests',
+    'peerconnection_unittests',
+    'rtc_stats_unittests',
+    'rtc_unittests',
+    'system_wrappers_unittests',
+    'test_support_unittests',
+    'tools_unittests',
+    'video_engine_tests',
+    'voice_engine_unittests',
+    'webrtc_nonparallel_tests',
+  )
+
+  ANDROID_INSTRUMENTATION_TESTS = (
+    'AppRTCMobileTest',
+    'libjingle_peerconnection_android_unittest',
+  )
+
+  ANDROID_JUNIT_TESTS = (
+    'android_junit_tests',
+  )
 
   DASHBOARD_UPLOAD_URL = 'https://chromeperf.appspot.com'
 
@@ -148,13 +148,11 @@ 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 = []
       if self.c.TEST_SUITE == 'webrtc':
-        self._isolated_targets += self.NORMAL_TESTS.keys()
-      if self.c.TEST_SUITE == 'android_swarming':
-        self._isolated_targets += (self.ANDROID_JUNIT_TESTS.keys() +
-                                   self.ANDROID_DEVICE_TESTS.keys() +
-                                   self.ANDROID_INSTRUMENTATION_TESTS.keys())
+        self._isolated_targets = (self.NORMAL_TESTS.keys())
+      elif self.c.TEST_SUITE == 'android_swarming':
+        self._isolated_targets = (self.ANDROID_DEVICE_TESTS +
+                                  self.ANDROID_INSTRUMENTATION_TESTS)
       self._isolated_targets = sorted(self._isolated_targets)
       if not self._isolated_targets: # pragma: no cover
         raise self.m.step.StepFailure('Isolation and swarming are only '
@@ -235,8 +233,14 @@ class WebRTCApi(recipe_api.RecipeApi):
             self.m.chromium_android.common_tests_setup_steps()
 
           for test in tests:
+            test.pre_run(self, suffix='')

[kjellander_chromium, 2016/10/21 11:04:07]

https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium_...
has a lot of try+except clauses around theirs. Do you know if we should have
that too if it's not a big deal. 
I guess as long as a failed test doesn't abort the build (i.e. other tests
continue to run and complete), then there shouldn't be a problem without them.

[ehmaldonado_chromium, 2016/10/21 13:12:49]

Good point.
This doesn't change the behavior we had before. When I start using Chromium's
classes, I'll make sure of it.

+
+          for test in tests:
             test.run(self, suffix='')
 
+          for test in tests:
+            test.post_run(self, suffix='')
+
           if run_android_device_steps:
             self.m.chromium_android.shutdown_device_monitor()
             self.m.chromium_android.logcat_dump(