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

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 528 matching lines @@
       'VERSION': _PICKLE_FORMAT_VERSION,
       'JAR_MD5SUM': jar_md5,
       'TEST_METHODS': tests,
     }
     with open(pickle_path, 'w') as pickle_file:
       pickle.dump(pickle_data, pickle_file)
 
   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
+      # Allow fully-qualified name as well as an omitted package.
+      names = ['%s.%s' % (c['class'], m['method']),
+               '%s.%s' % (c['class'].split('.')[-1], m['method'])]
+      return unittest_util.FilterTestNames(names, self._test_filter)
 
     def annotation_filter(all_annotations):
       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,
@@ skipping 77 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()