Revert of CQ to always post a message when Commit box is unchecked.

tests/pending_manager_test.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 pending_manager.py."""
 
 import logging
 import os
 import re
@@ skipping 96 matching lines @@
               'close_issue(%d)' % issue,
               "update_description(%d, u'foo')" % issue,
               "add_comment(%d, 'Change committed as 125')" % issue])
       else:
         self.context.checkout.check_calls(
             [ 'prepare(None)',
               'apply_patch(%r)' % (self.context.rietveld.patchsets[0],)])
         self.context.rietveld.check_calls(
             [ _try_comment(),
               "set_flag(%d, 1, 'commit', False)" % issue,
-              "add_comment(%d, %r)" % (issue, fake.failed_message())])
+              "add_comment(%d, %r)" % (issue, pc.FAILED_NO_MESSAGE)])
     else:
       if success:
         self.context.checkout.check_calls(
           self._prepare_apply_commit(0, issue))
         self.context.rietveld.check_calls(
             [ _try_comment(),
               'close_issue(%d)' % issue,
               "update_description(%d, u'foo')" % issue,
               "add_comment(%d, 'Change committed as 125')" % issue])
       else:
         # checkout is never touched in that case.
         self.context.checkout.check_calls([])
         if defered:
           self.context.rietveld.check_calls(
               [ _try_comment(),
                 "set_flag(%d, 1, 'commit', False)" % issue,
-                "add_comment(%d, %r)" % (issue, fake.failed_message())])
+                "add_comment(%d, %r)" % (issue, pc.FAILED_NO_MESSAGE)])
         else:
           self.context.rietveld.check_calls(
               [ "set_flag(%d, 1, 'commit', False)" % issue,
-                "add_comment(%d, %r)" % (issue, fake.failed_message())])
+                "add_comment(%d, %r)" % (issue, pc.FAILED_NO_MESSAGE)])
 
   def _prepare_apply_commit(self, index, issue, server_hooks_missing=False):
     """Returns a frequent sequence of action happening on the Checkout object.
 
     The list returned by this function should be used as an argument to
     self.context.checkout.check_calls().
     """
     seq = [
       # Reverts any previous modification or checkout the tree if it was not
       # present.
@@ skipping 109 matching lines @@
     pc.process_new_pending_commit()
     self.assertEqual([], pc.queue.iterate())
     pc.update_status()
     self.assertEqual([], pc.queue.iterate())
     self.context.checkout.check_calls(
         [ 'prepare(None)',
           'apply_patch(%r)' % (self.context.rietveld.patchsets[0],),
         ])
     self.context.rietveld.check_calls(
         [ _try_comment(),
-          "add_comment(%d, %r)" % (issue, fake.failed_message()),
+          "add_comment(%d, %r)" % (issue, pc.FAILED_NO_MESSAGE),
         ])
     self.context.status.check_names(['initial', 'abort'])
 
   def _check_defer_1(self, pc, result):
     issue = 31337
     self.assertEqual(len(pc.queue.iterate()), 0)
     pc.look_for_new_pending_commit()
     self.assertEqual(len(pc.queue.iterate()), 1)
     commit = pc.queue.get(issue)
     self.assertEqual(len(commit.verifications), 0)
@@ skipping 285 matching lines @@
     pc.scan_results()
     self.context.rietveld.check_calls(
         [ _try_comment(),
           'close_issue(%d)' % issue,
           "update_description(%d, u'foo')" % issue,
           "add_comment(%d, 'Change committed as 125')" % issue])
     self.context.status.check_names(['initial', 'why not', 'commit'])
     self.context.checkout.check_calls(
         self._prepare_apply_commit(0, issue, server_hooks_missing=True))
 
-  def testDisappeared(self):
+  def testDisapeared(self):
     issue = 31337
     verifiers = [
         project_base.ProjectBaseUrlVerifier(
           [r'^%s(.*)$' % re.escape(r'http://example.com/')]),
     ]
     pc = self._get_pc(verifiers, [])
     pc.context.rietveld.issues[issue]['base_url'] = 'http://unrelated.com/sub'
     pc.look_for_new_pending_commit()
     pc.process_new_pending_commit()
     pc.update_status()
     pc.scan_results()
     self.assertEqual(1, len(pc.queue.iterate()))
     del pc.context.rietveld.issues[issue]
     pc.look_for_new_pending_commit()
     pc.process_new_pending_commit()
     pc.update_status()
     pc.scan_results()
     self.assertEqual(0, len(pc.queue.iterate()))
     self.context.status.check_names(['abort'])
-    self.context.rietveld.check_calls(
-      ["add_comment(%d, 'CQ bit was unchecked on CL. Ignoring.')" % issue])
 
   def _get_pc_reviewer(self):
     verifiers = [
         reviewer_lgtm.ReviewerLgtmVerifier(
           ['.*'], [re.escape('commit-bot@example.com')])
     ]
     pc = self._get_pc(verifiers, [])
     return pc
 
   def _approve(self, sender=None):
@@ skipping 119 matching lines @@
     self.context.checkout.check_calls(
         self._prepare_apply_commit(0, issue))
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=[logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(sys.argv.count('-v'), 3)],
       format='%(levelname)5s %(module)15s(%(lineno)3d): %(message)s')
   unittest.main()