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

tests/trychange_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.super_mox import SuperMoxTestBase
 
 import subprocess2
 import trychange
 
 
 class TryChangeTestsBase(SuperMoxTestBase):
@@ skipping 22 matching lines @@
 
 
 class TryChangeUnittest(TryChangeTestsBase):
   """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
       'EPILOG', 'Escape', 'GIT', 'GuessVCS', 'GetMungedDiff', 'HELP_STRING',
       'InvalidScript', 'NoTryServerAccess', 'PrintSuccess', 'SCM', 'SVN',
       'TryChange', 'USAGE',
       'breakpad', 'datetime', 'errno', 'fix_encoding', 'gcl', 'gclient_utils',
-      'getpass',
+      'getpass', 'gen_parser',
       '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',
+      '--testfilter', 'test1',
+      '--bot', 'bot2',
+      '--testfilter', 'test2',
+    ]
+    options, args = trychange.gen_parser(None).parse_args(cmd)
+    self.assertEquals([], args)
+    # pylint: disable=W0212
+    values = trychange._ParseSendChangeOptions(options)
+    self.assertEquals(
+        [
+          ('user', 'maruel'),
+          ('name', None),
+          ('email', 'maruel@chromium.org'),
+          ('bot', 'bot1:test1,test2'),
+          ('bot', 'bot2:test1,test2'),

[Peter Mayo, 2012/03/07 15:53:46]

Eventually flagging this as ambiguous might be good:

some people may expect this set of arguments to mean
bot1:test1  bot2:test2

[M-A Ruel, 2012/03/07 17:52:56]

Good question. Not sure though about processing the flags in order.

+        ],
+        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)
+      self.fail()
+    except ValueError:
+      pass
+
+
 class SVNUnittest(TryChangeTestsBase):
   """trychange.SVN tests."""
   def testMembersChanged(self):
     members = [
       'AutomagicalSettings', 'CaptureStatus', 'GetCodeReviewSetting',
       'ReadRootFile', 'GenerateDiff', 'GetFileNames', 'files', 'file_tuples',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange.SVN, members)
 
@@ skipping 34 matching lines @@
     trychange.scm.GIT.GetPatchName(self.fake_root).AndReturn('bleh-1233')
     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__':
-  import unittest
   unittest.main()