[Android] Support gtest_filter + gtest_also_run_disabled_tests

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 HTMLParser
 import logging
 import os
 import re
 import tempfile
 import threading
@@ skipping 209 matching lines @@
   # Split the tests into positive and negative patterns (gtest treats
   # every pattern after the first '-' sign as an exclusion).
   positive_patterns = ':'.join(l for l in filter_lines if l[0] != '-')
   negative_patterns = ':'.join(l[1:] for l in filter_lines if l[0] == '-')
   if negative_patterns:
     negative_patterns = '-' + negative_patterns
 
   # Join the filter lines into one, big --gtest_filter argument.
   return positive_patterns + negative_patterns
 
+def TestNameWithoutDisabledPrefix(test_name):

[jbudorick, 2016/12/06 03:22:05]

This should have tests.

[shenghuazhang, 2016/12/06 23:56:06]

Done.

+  """Modify the test name without disabled prefix if prefix 'DISABLED_' or
+  'FLAKY_' presents.
+
+  Args:
+    test_name: The name of a test.
+  Returns:
+    A test name without prefix 'DISABLED_' or 'FLAKY_'.
+  """
+  disabled_prefixes = ['DISABLED_', 'FLAKY_']

[jbudorick, 2016/12/06 03:22:05]

compile DISABLED_ and FLAKY_ into regexes at module scope, e.g.

  _DISABLED_RE = re.compile('DISABLED_')

and then use them in this function.

[shenghuazhang, 2016/12/06 23:56:06]

Done.

+  for dp in disabled_prefixes:
+    if re.match(r'%s' % dp, test_name):

[jbudorick, 2016/12/06 03:22:05]

I think you should be able to do this with one or two re.sub calls & no re.match
or re.find calls.

[shenghuazhang, 2016/12/06 23:56:06]

Done.

+      test_name = re.sub(r'%s' % dp, '', test_name, 1)
+    if test_name.find(r'\.%s' % dp):
+      test_name = re.sub(r'\.%s' % dp, r'.', test_name)
+  return test_name
 
 class GtestTestInstance(test_instance.TestInstance):
 
   def __init__(self, args, data_deps_delegate, error_func):
     super(GtestTestInstance, self).__init__()
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._exe_dist_dir = None
     self._extract_test_list_from_filter = args.extract_test_list_from_filter
@@ skipping 182 matching lines @@
       gtest_filter_strings.append(self._gtest_filter)
 
     filtered_test_list = test_list
     # This lock is required because on older versions of Python
     # |unittest_util.FilterTestNames| use of |fnmatch| is not threadsafe.
     with self._filter_tests_lock:
       for gtest_filter_string in gtest_filter_strings:
         logging.debug('Filtering tests using: %s', gtest_filter_string)
         filtered_test_list = unittest_util.FilterTestNames(
             filtered_test_list, gtest_filter_string)
+        if self._run_disabled:
+          for test in test_list:

[jbudorick, 2016/12/06 03:22:05]

While this appears to work, it looks like it'll be pretty inefficient w/ this
loop deprefixing each test in each iteration of the outer loop + the 'test not
in filtered_test_list' check. Can you tune it a bit?

[shenghuazhang, 2016/12/06 23:56:06]

Refactor the code by escape the outer gtest_filter_strings loop. It will loop
the rest tests only excluding filtered_test_list.

+            test_name_no_disabled = [TestNameWithoutDisabledPrefix(test)]
+            if test_name_no_disabled[0] == test:
+              continue
+            if unittest_util.FilterTestNames(test_name_no_disabled,
+                gtest_filter_string) and test not in filtered_test_list:
+              filtered_test_list.append(test)
     return filtered_test_list
 
   def _GenerateDisabledFilterString(self, disabled_prefixes):
     disabled_filter_items = []
 
     if disabled_prefixes is None:
       disabled_prefixes = ['FAILS_', 'PRE_', 'MANUAL_']
       if not self._run_disabled:
         disabled_prefixes += ['DISABLED_', 'FLAKY_']
 
     disabled_filter_items += ['%s*' % dp for dp in disabled_prefixes]
     disabled_filter_items += ['*.%s*' % dp for dp in disabled_prefixes]
 
     disabled_tests_file_path = os.path.join(
         host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'pylib', 'gtest',
         'filter', '%s_disabled' % self._suite)
     if disabled_tests_file_path and os.path.exists(disabled_tests_file_path):
       with open(disabled_tests_file_path) as disabled_tests_file:
         disabled_filter_items += [
             '%s' % l for l in (line.strip() for line in disabled_tests_file)
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
   #override
   def TearDown(self):
     """Do nothing."""
     pass