[Android] Add '--gtest_also_run_disabled_tests' logic in gtest runner

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 270 matching lines @@
 
     self._data_deps = []
     if args.test_filter:
       self._gtest_filter = args.test_filter
     elif args.test_filter_file:
       with open(args.test_filter_file, 'r') as f:
         self._gtest_filter = ConvertTestFilterFileIntoGTestFilterArgument(f)
     else:
       self._gtest_filter = None
 
+    self._run_disabled = args.run_disabled
+
     self._data_deps_delegate = data_deps_delegate
     self._runtime_deps_path = args.runtime_deps_path
     if not self._runtime_deps_path:
       logging.warning('No data dependencies will be pushed.')
 
     if args.app_data_files:
       self._app_data_files = args.app_data_files
       if args.app_data_file_dir:
         self._app_data_file_dir = args.app_data_file_dir
       else:
@@ skipping 34 matching lines @@
 
   @property
   def exe_dist_dir(self):
     return self._exe_dist_dir
 
   @property
   def extras(self):
     return self._extras
 
   @property
+  def gtest_also_run_disabled_tests(self):
+    return self._run_disabled
+
+  @property
   def gtest_filter(self):
     return self._gtest_filter
 
   @property
   def package(self):
     return self._apk_helper and self._apk_helper.GetPackageName()
 
   @property
   def permissions(self):
     return self._apk_helper and self._apk_helper.GetPermissions()
@@ skipping 48 matching lines @@
   def FilterTests(self, test_list, disabled_prefixes=None):
     """Filters |test_list| based on prefixes and, if present, a filter string.
 
     Args:
       test_list: The list of tests to filter.
       disabled_prefixes: A list of test prefixes to filter. Defaults to
         DISABLED_, FLAKY_, FAILS_, PRE_, and MANUAL_
     Returns:
       A filtered list of tests to run.
     """
-    gtest_filter_strings = [
-        self._GenerateDisabledFilterString(disabled_prefixes)]
+    gtest_filter_strings = [self._GenerateDisabledFilterString(
+        disabled_prefixes, self.gtest_also_run_disabled_tests)]
     if self._gtest_filter:
       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)
     return filtered_test_list
 
-  def _GenerateDisabledFilterString(self, disabled_prefixes):
+  def _GenerateDisabledFilterString(self, disabled_prefixes,
+                                    run_disabled=False):

[jbudorick, 2016/11/30 23:17:11]

Sorry, I should've made my comment about passing in run_disabled here. Does this
need to be passed in, or can we use it directly?

[shenghuazhang, 2016/11/30 23:52:44]

Oh no we don't need to pass this... Will use the arg directly.

     disabled_filter_items = []
 
     if disabled_prefixes is None:
       disabled_prefixes = ['DISABLED_', 'FLAKY_', 'FAILS_', 'PRE_', 'MANUAL_']
+    if run_disabled:

[shenghuazhang, 2016/11/30 21:58:01]

When 'disabled_prefixes' is an non-empty input, could delete 'DISABLED_' and
'FLAKY_' as well.

[jbudorick, 2016/11/30 23:17:11]

This is a bit more complex than just appending them to the end of the list if
run_disabled isn't set.

[shenghuazhang, 2016/11/30 23:52:44]

But it didn't consider to remove the inputted disabled_prefixes I think. When
the 'disabled_prefixes' argument is passed in as e.g. disabled_prefixes =
['DISABLED_', 'FLAKY_', ...], and when run_disabled is set to true, the prefixes
'DISABLED_' and 'FLAKY_' won't be removed by that way?

[jbudorick, 2016/11/30 23:54:14]

That's a fair point, and I hadn't considered it. That option isn't used (any
more?), though, so I think we can ignore that case.

[shenghuazhang, 2016/12/01 00:39:56]

OK that make sense. Will refactor it with appending way in next patch.

+      if 'DISABLED_' in disabled_prefixes:
+        disabled_prefixes.remove('DISABLED_')
+      if 'FLAKY_' in disabled_prefixes:
+        disabled_prefixes.remove('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