Remove testfilter support from "git cl"

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 from distutils.version import LooseVersion
@@ skipping 2511 matching lines @@
   return 0
 
 
 def CMDtry(parser, args):
   """Triggers a try job through Rietveld."""
   group = optparse.OptionGroup(parser, "Try job options")
   group.add_option(
       "-b", "--bot", action="append",
       help=("IMPORTANT: specify ONE builder per --bot flag. Use it multiple "
             "times to specify multiple builders. ex: "
-            "'-b win_rel:ui_tests,webkit_unit_tests -b win_layout'. See "
+            "'-b win_rel -b win_layout'. See "
             "the try server waterfall for the builders name and the tests "
-            "available. Can also be used to specify gtest_filter, e.g. "
-            "-b win_rel:base_unittests:ValuesTest.*Value"))
+            "available."))
   group.add_option(
       "-m", "--master", default='',
       help=("Specify a try master where to run the tries."))
   group.add_option(
       "-r", "--revision",
       help="Revision to use for the try job; default: the "
            "revision will be determined by the try server; see "
            "its waterfall for more info")
   group.add_option(
       "-c", "--clobber", action="store_true", default=False,
       help="Force a clobber before building; e.g. don't do an "
            "incremental build")
   group.add_option(
       "--project",
       help="Override which project to use. Projects are defined "
            "server-side to define what default bot set to use")
   group.add_option(
-      "-t", "--testfilter", action="append", default=[],
-      help=("Apply a testfilter to all the selected builders. Unless the "
-            "builders configurations are similar, use multiple "
-            "--bot <builder>:<test> arguments."))
-  group.add_option(
       "-n", "--name", help="Try job name; default to current branch name")
   parser.add_option_group(group)
   options, args = parser.parse_args(args)
 
   if args:
     parser.error('Unknown arguments: %s' % args)
 
   cl = Changelist()
   if not cl.GetIssue():
     parser.error('Need to upload first')
 
   props = cl.GetIssueProperties()
   if props.get('closed'):
     parser.error('Cannot send tryjobs for a closed CL')
 
   if props.get('private'):
     parser.error('Cannot use trybots with private issue')
 
   if not options.name:
     options.name = cl.GetBranch()
 
   if options.bot and not options.master:
     options.master, err_msg = GetBuilderMaster(options.bot)
     if err_msg:
       parser.error('Tryserver master cannot be found because: %s\n'
                    'Please manually specify the tryserver master'
                    ', e.g. "-m tryserver.chromium.linux".' % err_msg)
 
   def GetMasterMap():
-    # Process --bot and --testfilter.
+    # Process --bot.
     if not options.bot:
       change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
 
       # Get try masters from PRESUBMIT.py files.
       masters = presubmit_support.DoGetTryMasters(
           change,
           change.LocalPaths(),
           settings.GetRoot(),
           None,
           None,
           options.verbose,
           sys.stdout)
       if masters:
         return masters
 
       # Fall back to deprecated method: get try slaves from PRESUBMIT.py files.

[M-A Ruel, 2015/01/21 14:23:53]

Why not remove this too?

[Paweł Hajdan Jr., 2015/01/21 14:36:18]

I'm concerned we may have repos which still use it (potentially e.g. nacl or
some other with even smaller teams).

[M-A Ruel, 2015/01/21 14:48:38]

That's true.

       options.bot = presubmit_support.DoGetTrySlaves(
           change,
           change.LocalPaths(),
           settings.GetRoot(),
           None,
           None,
           options.verbose,
           sys.stdout)
     if not options.bot:
       parser.error('No default try builder to try, use --bot')
 
     builders_and_tests = {}
     # TODO(machenbach): The old style command-line options don't support
     # multiple try masters yet.
     old_style = filter(lambda x: isinstance(x, basestring), options.bot)
     new_style = filter(lambda x: isinstance(x, tuple), options.bot)
 
     for bot in old_style:
       if ':' in bot:
-        builder, tests = bot.split(':', 1)
-        builders_and_tests.setdefault(builder, []).extend(tests.split(','))
+        parser.error('Specifying testfilter is no longer supported')
       elif ',' in bot:
         parser.error('Specify one bot per --bot flag')
       else:
         builders_and_tests.setdefault(bot, []).append('defaulttests')
 
     for bot, tests in new_style:
       builders_and_tests.setdefault(bot, []).extend(tests)
 
     # Return a master map with one master to be backwards compatible. The
     # master name defaults to an empty string, which will cause the master
     # not to be set on rietveld (deprecated).
     return {options.master: builders_and_tests}
 
   masters = GetMasterMap()
 
-  if options.testfilter:
-    forced_tests = sum((t.split(',') for t in options.testfilter), [])
-    masters = dict((master, dict(
-        (b, forced_tests) for b, t in slaves.iteritems()
-        if t != ['compile'])) for master, slaves in masters.iteritems())
-
   for builders in masters.itervalues():
     if any('triggered' in b for b in builders):
       print >> sys.stderr, (
           'ERROR You are trying to send a job to a triggered bot. This type of'
           ' bot requires an\ninitial job from a parent (usually a builder).  '
           'Instead send your job to the parent.\n'
           'Bot list: %s' % builders)
       return 1
 
   patchset = cl.GetMostRecentPatchset()
@@ skipping 291 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))