Rework bot and test parsing to allow receipt of (bot, set(test)) specifications.

tests/trychange_unittest.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.
 
 """Unit tests for trychange.py."""
 
 import os
 import sys
 import unittest
@@ skipping 33 matching lines @@
 
 class TryChangeUnittest(TryChangeTestsBase):
   """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
       'DieWithError', 'EPILOG', 'Escape', 'GIT', 'GetMungedDiff', 'GuessVCS',
       'HELP_STRING', 'InvalidScript', 'NoTryServerAccess', 'OptionParser',
       'PrintSuccess',
       'RunCommand', 'RunGit', 'SCM', 'SVN', 'TryChange', 'USAGE', 'breakpad',
       'datetime', 'errno', 'fix_encoding', 'gcl', 'gclient_utils', 'gen_parser',
-      'getpass', 'json', 'logging', 'optparse', 'os', 'posixpath', 're', 'scm',
-      'shutil', 'subprocess2', 'sys', 'tempfile', 'urllib']
+      'getpass', 'itertools', 'json', 'logging', 'optparse', 'os', 'posixpath',
+      're', 'scm', 'shutil', 'subprocess2', 'sys', 'tempfile', 'urllib']
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange, members)
 
 
 class TryChangeSimpleTest(unittest.TestCase):
   # Doesn't require supermox to run.
   def test_flags(self):
     cmd = [
       '--bot', 'bot1,bot2',
       '--testfilter', 'test1',
       '--testfilter', 'test2',
       '--user', 'joe',
       '--email', 'joe@example.com',
     ]
     options, args = trychange.gen_parser(None).parse_args(cmd)
     self.assertEquals([], args)
     # pylint: disable=W0212
-    values = trychange._ParseSendChangeOptions(options)
+    bot_spec = trychange._ParseBotList(options.bot, options.testfilter)
+    if options.testfilter:
+      bot_spec = trychange._ApplyTestFilter(options.testfilter, bot_spec)
+    values = trychange._ParseSendChangeOptions(bot_spec, options)
     self.assertEquals(
         [
           ('user', 'joe'),
           ('name', None),
           ('email', 'joe@example.com'),
           ('bot', 'bot1:test1,test2'),
           ('bot', 'bot2:test1,test2'),
         ],
         values)
 
   def test_flags_bad_combination(self):
     cmd = [
       '--bot', 'bot1:test1',
       '--testfilter', 'test2',
     ]
     options, args = trychange.gen_parser(None).parse_args(cmd)
     self.assertEquals([], args)
     try:
       # pylint: disable=W0212
-      trychange._ParseSendChangeOptions(options)
+      trychange._ParseBotList(options.bot, options.testfilter)
       self.fail()
     except ValueError:
       pass
 
 
 class SVNUnittest(TryChangeTestsBase):
   """trychange.SVN tests."""
   def testMembersChanged(self):
     members = [
       'AutomagicalSettings', 'CaptureStatus', 'GetCodeReviewSetting',
@@ skipping 42 matching lines @@
     trychange.scm.GIT.GetEmail(self.fake_root).AndReturn('georges@example.com')
     self.mox.ReplayAll()
     git = trychange.GIT(self.options, self.fake_root, self.options.files)
     self.assertEqual(git.GetFileNames(), self.expected_files)
     self.assertEqual(git.checkout_root, self.fake_root)
     self.assertEqual(git.GenerateDiff(), 'A diff')
 
 
 if __name__ == '__main__':
   unittest.main()