improve logging slightly

tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 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,W0212,W0403
 
@@ skipping 402 matching lines @@
     presubmit.random.randint(0, 4).AndReturn(1)
     self.mox.ReplayAll()
 
     input_buf = StringIO.StringIO('y\n')
     change = presubmit.Change('mychange', '\n'.join(description_lines),
                               self.fake_root_dir, files, 0, 0)
     output = presubmit.DoPresubmitChecks(
         change, False, True, None, input_buf, None, False)
     self.failIf(output.should_continue())
     self.assertEqual(output.getvalue().count('!!'), 2)
-    self.assertEqual(output.getvalue().count('Running presubmit hooks...\n'), 1)
+    self.assertEqual(output.getvalue().count(
+        'Running presubmit upload checks ...\n'), 1)
 
   def testDoPresubmitChecksPromptsAfterWarnings(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'NOSUCHKEY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
@@ skipping 18 matching lines @@
     output = presubmit.DoPresubmitChecks(
         change, False, True, None, input_buf, None, True)
     self.failIf(output.should_continue())
     self.assertEqual(output.getvalue().count('??'), 2)
 
     input_buf = StringIO.StringIO('y\n')  # say yes to the warning
     output = presubmit.DoPresubmitChecks(
         change, False, True, None, input_buf, None, True)
     self.failUnless(output.should_continue())
     self.assertEquals(output.getvalue().count('??'), 2)
-    self.assertEqual(output.getvalue().count('Running presubmit hooks...\n'), 1)
+    self.assertEqual(output.getvalue().count(
+        'Running presubmit upload checks ...\n'), 1)
 
   def testDoPresubmitChecksNoWarningPromptIfErrors(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'NOSUCHKEY=http://tracker/123',
                          'REALLYNOSUCHKEY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
@@ skipping 12 matching lines @@
     presubmit.random.randint(0, 4).AndReturn(1)
     self.mox.ReplayAll()
 
     change = presubmit.Change('mychange', '\n'.join(description_lines),
                               self.fake_root_dir, files, 0, 0)
     output = presubmit.DoPresubmitChecks(change, False, True, None, None,
         None, False)
     self.assertEqual(output.getvalue().count('??'), 2)
     self.assertEqual(output.getvalue().count('XX!!XX'), 2)
     self.assertEqual(output.getvalue().count('(y/N)'), 0)
-    self.assertEqual(output.getvalue().count('Running presubmit hooks...\n'), 1)
+    self.assertEqual(output.getvalue().count(
+        'Running presubmit upload checks ...\n'), 1)
 
   def testDoDefaultPresubmitChecksAndFeedback(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'STORY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     DEFAULT_SCRIPT = """
@@ skipping 13 matching lines @@
     presubmit.random.randint(0, 4).AndReturn(0)
     self.mox.ReplayAll()
 
     input_buf = StringIO.StringIO('y\n')
     # Always fail.
     change = presubmit.Change('mychange', '\n'.join(description_lines),
                               self.fake_root_dir, files, 0, 0)
     output = presubmit.DoPresubmitChecks(
         change, False, True, None, input_buf, DEFAULT_SCRIPT, False)
     self.failIf(output.should_continue())
-    text = ('Running presubmit hooks...\n'
+    text = ('Running presubmit upload checks ...\n'
             'Warning, no presubmit.py found.\n'
             'Running default presubmit script.\n'
+            '\n'
             '** Presubmit ERRORS **\n!!\n\n'
             'Was the presubmit check useful? Please send feedback & hate mail '
             'to maruel@chromium.org!\n')
     self.assertEquals(output.getvalue(), text)
 
   def testDirectoryHandling(self):
     files = [
       ['A', 'isdir'],
       ['A', presubmit.os.path.join('isdir', 'blat.cc')],
     ]
@@ skipping 51 matching lines @@
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input_buf = StringIO.StringIO('y\n')
     change = presubmit.Change(
         'foo', "Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n",
         self.fake_root_dir, None, 0, 0)
     self.failUnless(presubmit.DoPresubmitChecks(
         change, False, True, output, input_buf, DEFAULT_SCRIPT, False))
     self.assertEquals(output.getvalue(),
-                      ('Running presubmit hooks...\n'
+                      ('Running presubmit upload checks ...\n'
                        'Warning, no presubmit.py found.\n'
                        'Running default presubmit script.\n'
+                       '\n'
                        '** Presubmit Messages **\n'
-                       'http://tracker.com/42\n\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('def foo():\n  return\n'))
 
     # bad results
     starts_with_space_result = ['  starts_with_space']
@@ skipping 1346 matching lines @@
   def testCannedCheckOwners_HTTPS_HostURL(self):
     self.AssertOwnersWorks(approvers=set(['ben@example.com']),
                            host_url='https://localhost')
 
   def testCannedCheckOwners_MissingSchemeInHostURL(self):
     self.AssertOwnersWorks(approvers=set(['ben@example.com']),
                            host_url='localhost')
 
   def testCannedCheckOwners_NoIssue(self):
     self.AssertOwnersWorks(issue=None,
-                           expected_output='Change not uploaded for review\n')
+        expected_output="OWNERS check failed: this change has no Rietveld "
+                        "issue number, so we can't check it for approvals.\n")
 
   def testCannedCheckOwners_NoLGTM(self):
     self.AssertOwnersWorks(expected_output='Missing LGTM from someone '
                                            'other than john@example.com\n')
 
   def testCannedCheckOwners_OnlyOwnerLGTM(self):
     self.AssertOwnersWorks(approvers=set(['john@example.com']),
                            expected_output='Missing LGTM from someone '
                                            'other than john@example.com\n')
 
@@ skipping 15 matching lines @@
 
   def testCannedCheckOwners_WithLGTMs(self):
     self.AssertOwnersWorks(approvers=set(['ben@example.com']),
                            uncovered_files=set())
 
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()