Index: build/android/pylib/instrumentation/instrumentation_test_instance.py |
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py |
index cd8617cfc15f7bb84fa79a60caa1a71261dd2de9..4ea374d669a9779330f14e232e2b50dc8a32f32e 100644 |
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py |
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py |
@@ -547,7 +547,7 @@ class InstrumentationTestInstance(test_instance.TestInstance): |
or unittest_util.FilterTestNames(t, self._test_filter)) |
def annotation_filter(all_annotations): |
- if not self._annotations: |
+ if not self._annotations or not all_annotations: |
jbudorick
2016/04/07 02:30:11
I don't think this is logically consistent. A test
jbudorick
2016/04/07 02:31:26
(or 3, remove the default annotations entirely, bu
agrieve
2016/04/07 02:41:12
Should we add an exception when we detect a test m
jbudorick
2016/04/07 02:50:18
Honestly, I think the right answer for this is pro
|
return True |
return any_annotation_matches(self._annotations, all_annotations) |