Fixing unit tests to match --project changes.

tests/presubmit_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 presubmit_support.py and presubmit_canned_checks.py."""
 
 # pylint is too confused.
 # pylint: disable=E1101,E1103,R0201,W0212,W0403
 
@@ skipping 643 matching lines @@
                        '\n'
                        '** Presubmit Messages **\n'
                        'http://tracker.com/42\n'
                        '\n'
                        'Presubmit checks passed.\n'))
 
   def testGetTrySlavesExecuter(self):
     self.mox.ReplayAll()
 
     executer = presubmit.GetTrySlavesExecuter()
-    self.assertEqual([], executer.ExecPresubmitScript('', ''))
+    self.assertEqual([], executer.ExecPresubmitScript('', '', ''))
     self.assertEqual(
-        [], executer.ExecPresubmitScript('def foo():\n  return\n', ''))
+        [], executer.ExecPresubmitScript('def foo():\n  return\n', '', ''))

[M-A Ruel, 2011/05/26 12:49:49]

You don't want to add a quick test for 'def foo(project):\n  return project\n' ?

[bradn, 2011/05/26 16:52:06]

Done.

 
     # 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:
       self.assertRaises(presubmit.PresubmitFailure,
                         executer.ExecPresubmitScript,
-                        self.presubmit_tryslave % result, '')
+                        self.presubmit_tryslave % result, '', '')
 
     # 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:
       self.assertEqual(
           result,
-          executer.ExecPresubmitScript(self.presubmit_tryslave % result, ''))
+          executer.ExecPresubmitScript(
+              self.presubmit_tryslave % result, '', ''))
 
   def testDoGetTrySlaves(self):
     join = presubmit.os.path.join
     filename = 'foo.cc'
     filename_linux = join('linux_only', 'penguin.cc')
     root_presubmit = join(self.fake_root_dir, 'PRESUBMIT.py')
     linux_presubmit = join(self.fake_root_dir, 'linux_only', 'PRESUBMIT.py')
     inherit_path = presubmit.os.path.join(self.fake_root_dir,
                                           self._INHERIT_SETTINGS)
 
     presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(root_presubmit).AndReturn(True)
     presubmit.gclient_utils.FileRead(root_presubmit, 'rU').AndReturn(
         self.presubmit_tryslave % '["win"]')
 
     presubmit.os.path.isfile(inherit_path).AndReturn(False)
     presubmit.os.path.isfile(root_presubmit).AndReturn(True)
     presubmit.os.path.isfile(linux_presubmit).AndReturn(True)
     presubmit.gclient_utils.FileRead(root_presubmit, 'rU').AndReturn(
         self.presubmit_tryslave % '["win"]')
     presubmit.gclient_utils.FileRead(linux_presubmit, 'rU').AndReturn(
         self.presubmit_tryslave % '["linux"]')
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     self.assertEqual(['win'],
                      presubmit.DoGetTrySlaves([filename], self.fake_root_dir,
-                                              None, False, output))
+                                              None, None, False, output))
     output = StringIO.StringIO()
     self.assertEqual(['win', 'linux'],
                      presubmit.DoGetTrySlaves([filename, filename_linux],
-                                              self.fake_root_dir, None, False,
-                                              output))
+                                              self.fake_root_dir, None, None,
+                                              False, output))

[M-A Ruel, 2011/05/26 12:49:49]

Please use space instead.

[bradn, 2011/05/26 16:52:06]

Done.

 
   def testMainUnversioned(self):
     # OptParser calls presubmit.os.path.exists and is a pain when mocked.
     self.UnMock(presubmit.os.path, 'exists')
     self.mox.StubOutWithMock(presubmit, 'DoPresubmitChecks')
     self.mox.StubOutWithMock(presubmit, 'ParseFiles')
     presubmit.scm.determine_scm(self.fake_root_dir).AndReturn(None)
     presubmit.ParseFiles(['random_file.txt'], None
         ).AndReturn(['random_file.txt'])
     output = self.mox.CreateMock(presubmit.PresubmitOutput)
@@ skipping 1418 matching lines @@
         whitelist=['^a$', '^b$'],
         blacklist=['a'])
     self.assertEqual(results, [])
     self.checkstdout(
         'Running %s\n' % presubmit.os.path.join('random_directory', 'b'))
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()