Fix presubmit_support.py run standalone and RunPythonUnitTests

tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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."""
 
 import exceptions
 import random
 import string
@@ skipping 951 matching lines @@
     input_api = self.MockInputApi()
     input_api.is_committing = False
     self.mox.ReplayAll()
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, [])
     self.assertEquals(results, [])
 
   def testRunPythonUnitTestsNonExistent1(self):
     input_api = self.MockInputApi()
     input_api.is_committing = False
-    presubmit_canned_checks._RunPythonUnitTests_LoadTests('_non_existent_module'
-        ).AndRaise(exceptions.ImportError('Blehh'))
+    presubmit_canned_checks._RunPythonUnitTests_LoadTests(
+        input_api, '_non_existent_module').AndRaise(
+            exceptions.ImportError('Blehh'))
     self.mox.ReplayAll()
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['_non_existent_module'])
     self.assertEquals(len(results), 1)
     self.assertEquals(results[0].__class__,
                       presubmit.OutputApi.PresubmitNotifyResult)
 
   def testRunPythonUnitTestsNonExistent2(self):
     input_api = self.MockInputApi()
     input_api.is_committing = True
-    presubmit_canned_checks._RunPythonUnitTests_LoadTests('_non_existent_module'
-        ).AndRaise(exceptions.ImportError('Blehh'))
+    presubmit_canned_checks._RunPythonUnitTests_LoadTests(
+        input_api, '_non_existent_module').AndRaise(
+            exceptions.ImportError('Blehh'))
     self.mox.ReplayAll()
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['_non_existent_module'])
     self.assertEquals(len(results), 1)
     self.assertEquals(results[0].__class__, presubmit.OutputApi.PresubmitError)
 
   def testRunPythonUnitTestsEmpty1(self):
     input_api = self.MockInputApi()
     input_api.is_committing = False
     test_module = self.mox.CreateMockAnything()
-    presubmit_canned_checks._RunPythonUnitTests_LoadTests('test_module'
-        ).AndReturn([])
+    presubmit_canned_checks._RunPythonUnitTests_LoadTests(
+        input_api, 'test_module').AndReturn([])
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(results, [])
 
   def testRunPythonUnitTestsEmpty2(self):
     input_api = self.MockInputApi()
     input_api.is_committing = True
     test_module = self.mox.CreateMockAnything()
-    presubmit_canned_checks._RunPythonUnitTests_LoadTests('test_module'
-        ).AndReturn([])
+    presubmit_canned_checks._RunPythonUnitTests_LoadTests(
+        input_api, 'test_module').AndReturn([])
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(results, [])
 
   def testRunPythonUnitTestsFailure1(self):
     input_api = self.MockInputApi()
     input_api.is_committing = False
     input_api.unittest = self.mox.CreateMock(unittest)
     test = self.mox.CreateMockAnything()
-    presubmit_canned_checks._RunPythonUnitTests_LoadTests('test_module'
-        ).AndReturn([test])
+    presubmit_canned_checks._RunPythonUnitTests_LoadTests(
+        input_api, 'test_module').AndReturn([test])
     runner = self.mox.CreateMockAnything()
     input_api.unittest.TextTestRunner(verbosity=0).AndReturn(runner)
     suite = self.mox.CreateMockAnything()
     input_api.unittest.TestSuite([test]).AndReturn(suite)
     test_result = self.mox.CreateMockAnything()
     runner.run(suite).AndReturn(test_result)
     test_result.wasSuccessful().AndReturn(False)
-    test_result.failures = 2
-    test_result.errors = 3
+    test_result.failures = [None, None]
+    test_result.errors = [None, None, None]
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 1)
     self.assertEquals(results[0].__class__,
                       presubmit.OutputApi.PresubmitNotifyResult)
 
   def testRunPythonUnitTestsFailure2(self):
     input_api = self.MockInputApi()
     input_api.is_committing = True
     input_api.unittest = self.mox.CreateMock(unittest)
     test = self.mox.CreateMockAnything()
-    presubmit_canned_checks._RunPythonUnitTests_LoadTests('test_module'
-        ).AndReturn([test])
+    presubmit_canned_checks._RunPythonUnitTests_LoadTests(
+        input_api, 'test_module').AndReturn([test])
     runner = self.mox.CreateMockAnything()
     input_api.unittest.TextTestRunner(verbosity=0).AndReturn(runner)
     suite = self.mox.CreateMockAnything()
     input_api.unittest.TestSuite([test]).AndReturn(suite)
     test_result = self.mox.CreateMockAnything()
     runner.run(suite).AndReturn(test_result)
     test_result.wasSuccessful().AndReturn(False)
-    test_result.failures = 2
-    test_result.errors = 3
+    test_result.failures = [None, None]
+    test_result.errors = [None, None, None]
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 1)
     self.assertEquals(results[0].__class__, presubmit.OutputApi.PresubmitError)
 
   def testRunPythonUnitTestsSuccess(self):
     input_api = self.MockInputApi()
     input_api.is_committing = False
     input_api.unittest = self.mox.CreateMock(unittest)
     test = self.mox.CreateMockAnything()
-    presubmit_canned_checks._RunPythonUnitTests_LoadTests('test_module'
-        ).AndReturn([test])
+    presubmit_canned_checks._RunPythonUnitTests_LoadTests(
+        input_api, 'test_module').AndReturn([test])
     runner = self.mox.CreateMockAnything()
     input_api.unittest.TextTestRunner(verbosity=0).AndReturn(runner)
     suite = self.mox.CreateMockAnything()
     input_api.unittest.TestSuite([test]).AndReturn(suite)
     test_result = self.mox.CreateMockAnything()
     runner.run(suite).AndReturn(test_result)
     test_result.wasSuccessful().AndReturn(True)
     test_result.failures = 0
     test_result.errors = 0
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 0)
 
 
 if __name__ == '__main__':
   unittest.main()