Stop sending the testfilter= flag to the try server and process it locally.

trychange.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.
 
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
@@ skipping 295 matching lines @@
     values.append(('patchlevel', options.patchlevel))
   if options.issue:
     values.append(('issue', options.issue))
   if options.patchset:
     values.append(('patchset', options.patchset))
   if options.target:
     values.append(('target', options.target))
   if options.project:
     values.append(('project', options.project))
 
-  for bot in options.bot:
-    values.append(('bot', bot))
-  for t in options.testfilter:
-    values.append(('testfilter', t))
+  filters = ','.join(options.testfilter)
+  if filters:
+    for bot in options.bot:
+      if ':' in bot:
+        raise ValueError(
+            'Can\'t use both --testfilter and --bot builder:test formats '
+            'at the same time')
+      else:
+        values.append(('bot', '%s:%s' % (bot, filters)))
+  else:
+    for bot in options.bot:
+      values.append(('bot', bot))
   return values
 
 
 def _SendChangeHTTP(options):
   """Send a change to the try server using the HTTP protocol."""
   if not options.host:
     raise NoTryServerAccess('Please use the --host option to specify the try '
         'server host to connect to.')
   if not options.port:
     raise NoTryServerAccess('Please use the --port option to specify the try '
@@ skipping 151 matching lines @@
       new_file = posixpath.join(path_diff, diff[i][4:]).replace('\\', '/')
       if diff[i].startswith('--- '):
         file_path = new_file.split('\t')[0].strip()
         if file_path.startswith('a/'):
           file_path = file_path[2:]
         changed_files.append(('M', file_path))
       diff[i] = diff[i][0:4] + new_file
   return (diff, changed_files)
 
 
-def TryChange(argv,
-              change,
-              swallow_exception,
-              prog=None,
-              extra_epilog=None):
-  """
-  Args:
-    argv: Arguments and options.
-    change: Change instance corresponding to the CL.
-    swallow_exception: Whether we raise or swallow exceptions.
-  """
+def gen_parser(prog):
   # Parse argv
   parser = optparse.OptionParser(usage=USAGE,
                                  version=__version__,
                                  prog=prog)
-  epilog = EPILOG % { 'prog': prog }
-  if extra_epilog:
-    epilog += extra_epilog
-  parser.epilog = epilog
-  # Remove epilog formatting
-  parser.format_epilog = lambda x: parser.epilog
   parser.add_option("-v", "--verbose", action="count", default=0,
                     help="Prints debugging infos")
   group = optparse.OptionGroup(parser, "Result and status")
   group.add_option("-u", "--user", default=getpass.getuser(),
                    help="Owner user name [default: %default]")
   group.add_option("-e", "--email",
                    default=os.environ.get('TRYBOT_RESULTS_EMAIL_ADDRESS',
                         os.environ.get('EMAIL_ADDRESS')),
                    help="Email address where to send the results. Use either "
                         "the TRYBOT_RESULTS_EMAIL_ADDRESS environment "
@@ skipping 107 matching lines @@
   group.add_option("--use_svn",
                    action="store_const",
                    const=_SendChangeSVN,
                    dest="send_patch",
                    help="Use SVN to talk to the try server")
   group.add_option("-S", "--svn_repo",
                    metavar="SVN_URL",
                    help="SVN url to use to write the changes in; --use_svn is "
                         "implied when using --svn_repo")
   parser.add_option_group(group)
+  return parser
+
+
+def TryChange(argv,
+              change,
+              swallow_exception,
+              prog=None,
+              extra_epilog=None):
+  """
+  Args:
+    argv: Arguments and options.
+    change: Change instance corresponding to the CL.
+    swallow_exception: Whether we raise or swallow exceptions.
+  """
+  parser = gen_parser(prog)
+  epilog = EPILOG % { 'prog': prog }
+  if extra_epilog:
+    epilog += extra_epilog
+  parser.epilog = epilog
+  # Remove epilog formatting
+  parser.format_epilog = lambda x: parser.epilog
 
   options, args = parser.parse_args(argv)
 
   # If they've asked for help, give it to them
   if len(args) == 1 and args[0] == 'help':
     parser.print_help()
     return 0
 
   # If they've said something confusing, don't spawn a try job until you
   # understand what they want.
@@ skipping 175 matching lines @@
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(TryChange(None, None, False))