Add --test_filter with * wildcard functionality for classname and

tools/chrome_proxy/webdriver/common.py

Index: tools/chrome_proxy/webdriver/common.py
diff --git a/tools/chrome_proxy/webdriver/common.py b/tools/chrome_proxy/webdriver/common.py
index 695bb5634bdbcbd619bdf44e642eded0ee9cb2f4..34191b99bbe32daceb575c035ae82ca42a107338 100644
--- a/tools/chrome_proxy/webdriver/common.py
+++ b/tools/chrome_proxy/webdriver/common.py
@@ -27,6 +27,15 @@ def ParseFlags():
     A new Namespace object with class properties for each argument added below.
     See pydoc for argparse.
   """
+  def TestFilter(v):
+    try:
+      # The filtering here allows for any number of * wildcards with a required
+      # . separator between classname and methodname, but no other special
+      # characters.
+      return re.match('^[A-Za-z_0-9\*]+\.[A-Za-z_0-9\*]+$', v).group(0)

[RyanSturm, 2017/01/11 17:42:10]

This should accept TestClass* in addition to TestClass.TestCase*, so maybe
^([A-Za-z_0-9\*]+\.)?[A-Za-z_0-9\*]+$ (writing TestClass*.* is annoying and not
the behavior of gtest_filter)

Alternatively, I'm somewhat confident that gtest_filter has to have an exact
starting match with an optional trailing * (no intermediary *), so a very weak
form of regex. If you want to do that behavior, nobody will complain I believe.

In that case you would want to match ^([A-Za-z_0-9\.]+*?$.

[Robert Ogden, 2017/01/11 19:19:44]

Took the first option. It seems cleaner to me.

+    except:
+      raise argparse.ArgumentTypeError('Test filter "%s" is not a valid filter'
+        % v)
   parser = argparse.ArgumentParser()
   parser.add_argument('--browser_args', type=str, help='Override browser flags '
     'in code with these flags')
@@ -53,6 +62,10 @@ def ParseFlags():
     action='store_true')
   parser.add_argument('-f', '--failfast', help='Stop the test run on the first '
     'error or failure.', action='store_true')
+  parser.add_argument('--test_filter', '--gtest_filter', type=TestFilter,
+    help='The filter to use when discovering tests to run, in the form '
+    '<class name>.<method name> Wildcards (*) are accepted. Default=*.*',
+    default='*.test*')
   parser.add_argument('--logging_level', choices=['DEBUG', 'INFO', 'WARN',
     'ERROR', 'CRIT'], default='WARN', help='The logging verbosity for log '
     'messages, printed to stderr. To see stderr logging output during a '
@@ -540,9 +553,22 @@ class IntegrationTest(unittest.TestCase):
     logger.info('sys.argv parsed to %s', str(flags))
     if flags.catch:
       unittest.installHandler()
+    # Use python's test discovery to locate tests files that have subclasses of
+    # unittest.TestCase and methods beginning with 'test'.
     pattern = '*.py' if run_all_tests else os.path.basename(sys.argv[0])
     loader = unittest.TestLoader()
-    tests = loader.discover(os.path.dirname(__file__), pattern=pattern)
+    test_suite_iter = loader.discover(os.path.dirname(__file__),
+      pattern=pattern)
+    # Match class and method name on the given test filter from --test_filter.
+    tests = unittest.TestSuite()
+    test_filter_re = flags.test_filter.replace('.', r'\.').replace('*', '.*')

[RyanSturm, 2017/01/11 17:42:10]

See comment above. I think if you do the last approach, this should still work.

[Robert Ogden, 2017/01/11 19:19:44]

Acknowledged.

+    for test_suite in test_suite_iter:
+      for test_case in test_suite:
+        for test in test_case:
+          # Drop the file name in the form <filename>.<classname>.<methodname>
+          test_id = test.id()[test.id().find('.') + 1:]
+          if re.match(test_filter_re, test_id):
+            tests.addTest(test)
     testRunner = unittest.runner.TextTestRunner(verbosity=2,
       failfast=flags.failfast, buffer=(not flags.disable_buffer))
     testRunner.run(tests)