Android: fixes option to exclude specific annotated Android instrumentation tests.

build/android/pylib/host_driven/test_info_collection.py

 # Copyright (c) 2012 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.
 
 """Module containing information about the python-driven tests."""
 
 import logging
 import os
 
 import tests_annotations
@@ skipping 75 matching lines @@
     if annotations and len(annotations) == 1 and annotations[0] == 'SmallTest':
       tests_without_annotation = [
           t for t in self.all_tests if
           not tests_annotations.AnnotatedFunctions.GetTestAnnotations(
               t.qualified_name)]
       test_names = [t.qualified_name for t in tests_without_annotation]
       logging.warning('The following tests do not contain any annotation. '
                       'Assuming "SmallTest":\n%s',
                       '\n'.join(test_names))
       available_tests += tests_without_annotation
-    excluded_tests = [t for t in available_tests if
-                      self._AnnotationIncludesTest(t, exclude_annotations)]
-    available_tests = list(set(available_tests) - set(excluded_tests))
+    if exclude_annotations:
+      excluded_tests = [t for t in available_tests if
+                        self._AnnotationIncludesTest(t, exclude_annotations)]
+      available_tests = list(set(available_tests) - set(excluded_tests))
     available_tests = [t for t in available_tests if
                        self._NameFilterIncludesTest(t, name_filter)]
 
     return available_tests
 
   def _AnnotationIncludesTest(self, test_info, annotation_filter_list):
     """Checks whether a given test represented by test_info matches annotation.
 
     Args:
       test_info: TestInfo object representing the test
@@ skipping 25 matching lines @@
     Foo.testBar and Bar.testFoo. 'foo' would not match either.
 
     Args:
       test_info: TestInfo object representing the test
       name_filter: substring to check for in the qualified name of the test
 
     Returns:
       True if no name filter supplied or it matches; False otherwise.
     """
     return not name_filter or name_filter in test_info.qualified_name