Fix presubmit_support.py run standalone and RunPythonUnitTests

TEST=none
BUG=none
TBR=joi

Review URL: http://codereview.chromium.org/119285

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@17839 0039d316-1c4b-4281-b951-d872f2087c98

presubmit_canned_checks.py

@@ -135,7 +135,7 @@ def RunPythonUnitTests(input_api, output_api, unit_tests):
   outputs = []
   for unit_test in unit_tests:
     try:
-      tests_suite.extend(_RunPythonUnitTests_LoadTests(unit_test))
+      tests_suite.extend(_RunPythonUnitTests_LoadTests(input_api, unit_test))
     except ImportError:
       outputs.append(message_type("Failed to load %s" % unit_test,
                                   long_text=input_api.traceback.format_exc()))
@@ -143,6 +143,6 @@ def RunPythonUnitTests(input_api, output_api, unit_tests):
   results = input_api.unittest.TextTestRunner(verbosity=0).run(
       input_api.unittest.TestSuite(tests_suite))
   if not results.wasSuccessful():
-    outputs.append(message_type(
-        "%d unit tests failed." % (results.failures + results.errors)))
+    outputs.append(message_type("%d unit tests failed." %
+                                (len(results.failures) + len(results.errors))))
   return outputs

presubmit_support.py

@@ -731,7 +731,7 @@ def Main(argv):
   files = ParseFiles(args, options.recursive)
   if options.verbose:
     print "Found %d files." % len(files)
-  return not DoPresubmitChecks(gcl.ChangeInfo(name='temp', files=files),
+  return not DoPresubmitChecks(gcl.ChangeInfo('No name', 0, 0, '', files),
                                options.commit,
                                options.verbose,
                                sys.stdout,

tests/presubmit_unittest.py

@@ -969,8 +969,9 @@ class CannedChecksUnittest(PresubmitTestsBase):
   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'])
@@ -981,8 +982,9 @@ class CannedChecksUnittest(PresubmitTestsBase):
   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'])
@@ -993,8 +995,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     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(
@@ -1005,8 +1007,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     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(
@@ -1018,8 +1020,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     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()
@@ -1027,8 +1029,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     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(
@@ -1042,8 +1044,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     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()
@@ -1051,8 +1053,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     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(
@@ -1065,8 +1067,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     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()