Refactor VideoCapturerAndroid tests in WebRTC.

webrtc/build/android/test_runner.py

Index: webrtc/build/android/test_runner.py
diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index fd8ca2fc0792032630f11358204d8917cb3eea16..476bd8342c6b2e65a7bd2e0a7c251c63e8d33754 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -27,6 +27,7 @@ sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR)
 
 import test_runner  # pylint: disable=W0406
 from pylib.gtest import gtest_test_instance
+from pylib.instrumentation import instrumentation_test_instance

[perkj_webrtc, 2016/06/08 08:48:10]

what is this doing? 

[sakal, 2016/06/08 09:20:14]

The test runner tries to run the tests defined in CameraVideoCapturerTest. Since
it is an abstract class they fail. I worked around this by adding Suppress
annotation to the tests. Since we are loaning the Chromium test runner I can't
really make changes to it in order to support this annotation. Instead, I just
change one of the constants here to make it support it.

I wonder if changing the CameraVideoCapturerTest class name not to end in Test
would also make the test runner to ignore it. I'll try that since I think it is
a cleaner solution if it works.

[sakal, 2016/06/08 11:12:30]

Changing the name of the CameraVideoCapturerTest class in fact made it be
ignored by the test runner. I think this is a cleaner solution.

 
 def main():
   # Set our own paths to the .isolate files.
@@ -55,6 +56,8 @@ def main():
     'webrtc_nonparallel_tests': 'webrtc/webrtc_nonparallel_tests.isolate',
     'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate',
   })
+  instrumentation_test_instance._EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS += [
+      'Suppress']
   # Override environment variable to make it possible for the scripts to find
   # the root directory (our symlinking of the Chromium build toolchain would
   # otherwise make them fail to do so).