Allow PRESUBMIT.py files to have old and new-style trybot specifications (as long as each file is c…

tests/presubmit_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 presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint: disable=E1101,E1103
 
 import functools
@@ skipping 905 matching lines @@
         None)
     executer = presubmit.GetTrySlavesExecuter()
     self.assertEqual([], executer.ExecPresubmitScript('', '', '', change))
     self.assertEqual([],
         executer.ExecPresubmitScript('def foo():\n  return\n', '', '', change))
 
     # bad results
     starts_with_space_result = ['  starts_with_space']
     not_list_result1 = "'foo'"
     not_list_result2 = "('a', 'tuple')"
-    for result in starts_with_space_result, not_list_result1, not_list_result2:
+    mixed_old_and_new = ['bot', ('bot2', set(['test']))]
+    not_set = [('bot2', ['test'])]
+    for result in (
+        starts_with_space_result, not_list_result1, not_list_result2,
+        mixed_old_and_new, not_set):
       self.assertRaises(presubmit.PresubmitFailure,
                         executer.ExecPresubmitScript,
                         self.presubmit_tryslave % result, '', '', change)
 
     # good results
     expected_result = ['1', '2', '3']
     empty_result = []
     space_in_name_result = ['foo bar', '1\t2 3']
-    for result in expected_result, empty_result, space_in_name_result:
+    new_style = [('bot', set(['cool', 'tests']))]
+    for result in (
+        expected_result, empty_result, space_in_name_result, new_style):
       self.assertEqual(
           result,
           executer.ExecPresubmitScript(
               self.presubmit_tryslave % result, '', '', change))
 
   def testGetTrySlavesExecuterWithProject(self):
     self.mox.ReplayAll()
 
     change = presubmit.Change(
         'foo',
@@ skipping 1788 matching lines @@
         owners_check=False)
     self.assertEqual(1, len(results))
     self.assertEqual(
         'Found line ending with white spaces in:', results[0]._message)
     self.checkstdout('')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()