[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 55 matching lines @@
 # TODO(jbudorick): Remove these once we're no longer parsing stdout to generate
 # results.
 _RE_TEST_STATUS = re.compile(
     r'\[ +((?:RUN)|(?:FAILED)|(?:OK)|(?:CRASHED)) +\]'
     r' ?([^ ]+)?(?: \((\d+) ms\))?$')
 # Crash detection constants.
 _RE_TEST_ERROR = re.compile(r'FAILURES!!! Tests run: \d+,'
                                     r' Failures: \d+, Errors: 1')
 _RE_TEST_CURRENTLY_RUNNING = re.compile(r'\[ERROR:.*?\]'
                                     r' Currently running: (.*)')
+_RE_DISABLED = re.compile(r'DISABLED_')
+_RE_FLAKY = re.compile(r'FLAKY_')
 
 def ParseGTestListTests(raw_list):
   """Parses a raw test list as provided by --gtest_list_tests.
 
   Args:
     raw_list: The raw test listing with the following format:
 
     IPCChannelTest.
       SendMessageInChannelConnected
     IPCSyncChannelTest.
@@ skipping 134 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):
+  """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 = [_RE_DISABLED, _RE_FLAKY]
+  for dp in disabled_prefixes:
+    test_name = re.sub(dp, '', test_name, 1)
+    test_name = re.sub(r'\.%s' % dp.pattern, '.', test_name)

[jbudorick, 2016/12/08 01:32:57]

nit: you should be able to replace these two lines with:

  test_name = dp.sub('', test_name)

[jbudorick, 2016/12/08 01:38:01]

lgtm w/ this nit

[shenghuazhang, 2016/12/08 19:37:29]

Refactor this by 2 pattern groups. 
- _RE_DISABLED = re.compile(r'^DISABLED_')
  _RE_FLAKY = re.compile(r'^FLAKY_')
Replace the pattern with ''.

-_RE_DOT_DISABLED = re.compile(r'\.DISABLED_')
 _RE_DOT_FLAKY = re.compile(r'\.FLAKY_')
Replace the pattern with '.'

+  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 and self._gtest_filter:
+        out_filtered_test_list = list(set(test_list)-set(filtered_test_list))
+        for test in out_filtered_test_list:

[jbudorick, 2016/12/08 01:32:57]

1) this is much better :)
2) to be consistent w/ the filtering above, what if you did:

  test_names_no_disabled = [
      TestNameWithoutDisabledPrefix(t)
      for t in out_filtered_test_list]
  filtered_test_list.extend(
      unittest_util.FilterTestNames(test_names_no_disabled, self._gtest_filter)

(I *think* that should work the same way.)
  

[jbudorick, 2016/12/08 01:38:01]

spoke offline, this is fine.

+          test_name_no_disabled = TestNameWithoutDisabledPrefix(test)
+          if test_name_no_disabled != test and unittest_util.FilterTestNames(
+              [test_name_no_disabled], self._gtest_filter):
+            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