Add option to exclude specific annotated Android instrumentation tests.

build/android/pylib/instrumentation/test_jar.py

 # Copyright (c) 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.
 
 """Helper class for instrumenation test jar."""
 
 import collections
 import logging
 import os
 import pickle
@@ skipping 155 matching lines @@
   def _GetTestsMissingAnnotation(self):
     """Get a list of test methods with no known annotations."""
     tests_missing_annotations = []
     for test_method in self.GetTestMethods():
       annotations_ = frozenset(self.GetTestAnnotations(test_method))
       if (annotations_.isdisjoint(self._ANNOTATIONS) and
           not self.IsPythonDrivenTest(test_method)):
         tests_missing_annotations.append(test_method)
     return sorted(tests_missing_annotations)
 
-  def _GetAllMatchingTests(self, annotation_filter_list, test_filter):
+  def _GetAllMatchingTests(self, annotation_filter_list,
+                           exclude_annotation_list, test_filter):
     """Get a list of tests matching any of the annotations and the filter.
 
     Args:
       annotation_filter_list: List of test annotations. A test must have at
-        least one of the these annotations. A test without any annotations
-        is considered to be SmallTest.
+        least one of these annotations. A test without any annotations is
+        considered to be SmallTest.
+      exclude_annotation_list: List of test annotations. A test must not have
+        any of these annotations.
       test_filter: Filter used for partial matching on the test method names.
 
     Returns:
       List of all matching tests.
     """
     if annotation_filter_list:
       available_tests = self.GetAnnotatedTests(annotation_filter_list)
       # Include un-annotated tests in SmallTest.
       if annotation_filter_list.count(self._DEFAULT_ANNOTATION) > 0:
         for test in self._GetTestsMissingAnnotation():
           logging.warning(
               '%s has no annotations. Assuming "%s".', test,
               self._DEFAULT_ANNOTATION)
           available_tests.append(test)
+      excluded_tests = self.GetAnnotatedTests(exclude_annotation_list)
+      available_tests = list(set(available_tests) - set(excluded_tests))
     else:
       available_tests = [m for m in self.GetTestMethods()
                          if not self.IsPythonDrivenTest(m)]
 
     tests = []
     if test_filter:
       # |available_tests| are in adb instrument format: package.path.class#test.
       filter_without_hash = test_filter.replace('#', '.')
       tests = [t for t in available_tests
                if filter_without_hash in t.replace('#', '.')]
     else:
       tests = available_tests
 
     return tests
 
   @staticmethod
   def IsPythonDrivenTest(test):
     return 'pythonDrivenTests' in test