👓 Allow instrumentation test filters to use fully-qualified class names

build/android/pylib/instrumentation/instrumentation_test_instance.py

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 9f1e439ca0b1bfd4fd3209857719044ceab423c9..20accf77f12adba64dbdbe2e1442ceec8d744a59 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -546,9 +546,12 @@ class InstrumentationTestInstance(test_instance.TestInstance):
   def _FilterTests(self, tests):
 
     def gtest_filter(c, m):
-      t = ['%s.%s' % (c['class'].split('.')[-1], m['method'])]
-      return (not self._test_filter
-              or unittest_util.FilterTestNames(t, self._test_filter))
+      if not self._test_filter:
+        return True
+      t1 = ['%s.%s' % (c['class'], m['method'])]

[jbudorick, 2016/04/27 19:31:40]

Could this instead just be

  t = ['%s.%s' % (c['class'], m['method']), '%s.%s' %(c['class'].split('.')[-1],
m['method'])]
  return unittest_util.FilterTestNames(t, self._test_filter)

? 

  

[agrieve, 2016/04/27 19:42:04]

Done.

+      t2 = ['%s.%s' % (c['class'].split('.')[-1], m['method'])]
+      return (unittest_util.FilterTestNames(t1, self._test_filter) or
+              unittest_util.FilterTestNames(t2, self._test_filter))
 
     def annotation_filter(all_annotations):
       if not self._annotations: