[Android] Fix feature annotation filtering for instrumentation tests.

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 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.
 
 import collections
 import copy
 import logging
 import os
 import pickle
 import re
@@ skipping 570 matching lines @@
       if not self._annotations:
         return True
       return any_annotation_matches(self._annotations, all_annotations)
 
     def excluded_annotation_filter(all_annotations):
       if not self._excluded_annotations:
         return True
       return not any_annotation_matches(self._excluded_annotations,
                                         all_annotations)
 
-    def any_annotation_matches(annotations, all_annotations):
+    def any_annotation_matches(filter_annotations, all_annotations):
       return any(
-          ak in all_annotations and (av is None or av == all_annotations[ak])
-          for ak, av in annotations.iteritems())
+          ak in all_annotations

[rnephew (Reviews Here), 2016/06/24 14:22:43]

These variables could probably be a little more descriptive. It took me awhile
to realize they meant annotation key and annotation value.

[jbudorick, 2016/06/24 14:24:56]

In a comprehension, I'd strongly prefer keeping them short.

+          and annotation_value_matches(av, all_annotations[ak])
+          for ak, av in filter_annotations.iteritems())
+
+    def annotation_value_matches(filter_av, av):
+      if filter_av is None:
+        return True
+      elif isinstance(av, dict):
+        return filter_av in av['value']
+      elif isinstance(av, list):
+        return filter_av in av
+      return filter_av == av
 
     filtered_classes = []
     for c in tests:
       filtered_methods = []
       for m in c['methods']:
         # Gtest filtering
         if not gtest_filter(c, m):
           continue
 
         all_annotations = dict(c['annotations'])
@@ skipping 66 matching lines @@
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()