Make test_runner allow exclude_annotations along with test filters

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."""
 # pylint: disable=W0702
 
 import logging
 import os
 import pickle
@@ skipping 250 matching lines @@
     """
     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)
-      if exclude_annotation_list:
-        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.IsHostDrivenTest(m)]
 
+    if exclude_annotation_list:
+      excluded_tests = self.GetAnnotatedTests(exclude_annotation_list)
+      available_tests = list(set(available_tests) - set(excluded_tests))
+
     tests = []
     if test_filter:
       # |available_tests| are in adb instrument format: package.path.class#test.
 
       # Maps a 'class.test' name to each 'package.path.class#test' name.
       sanitized_test_names = dict([
           (t.split('.')[-1].replace('#', '.'), t) for t in available_tests])
       # Filters 'class.test' names and populates |tests| with the corresponding
       # 'package.path.class#test' names.
       tests = [
@@ skipping 10 matching lines @@
             'ro.build.version.sdk').pGet(None)]
     tests = filter(
         lambda t: self._IsTestValidForSdkRange(t, min(sdk_versions)),
         tests)
 
     return tests
 
   @staticmethod
   def IsHostDrivenTest(test):
     return 'pythonDrivenTests' in test