Revert of Reduce spam from CQ.

pending_manager.py

 # coding=utf8
 # 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.
 """Commit queue manager class.
 
 Security implications:
 
 The following hypothesis are made:
 - Commit queue:
@@ skipping 526 matching lines @@
                 'revision': pending.revision,
                 'output': msg,
                 'url': viewvc_url}})
 
         # Closes the issue on Rietveld.
         # TODO(csharp): Retry if exceptions are encountered.
         try:
           self.context.rietveld.close_issue(pending.issue)
           self.context.rietveld.update_description(
               pending.issue, issue_desc.description)
+          self.context.rietveld.add_comment(
+              pending.issue, 'Change committed as %s' % pending.revision)
         except (urllib2.HTTPError, urllib2.URLError) as e:
           # Ignore AppEngine flakiness.
           logging.warning('Unable to fully close the issue')
-        self._discard_pending(pending,
-                              'Change committed as %s' % pending.revision)
+        # And finally remove the issue. If the close_issue() call above failed,
+        # it is possible the dashboard will be confused but it is harmless.
+        try:
+          self.queue.get(pending.issue)
+        except KeyError:
+          logging.error('Internal inconsistency for %d', pending.issue)
+        self.queue.remove(pending.issue)
       except (
           checkout.PatchApplicationFailed, patch.UnsupportedPatchFormat) as e:
         raise base.DiscardPending(pending, str(e))
       except subprocess2.CalledProcessError as e:
         stdout = getattr(e, 'stdout', None)
         out = 'Failed to apply the patch.'
         if stdout:
           out += '\n%s' % stdout
         raise base.DiscardPending(pending, out)
     except base.DiscardPending as e:
@@ skipping 33 matching lines @@
     """Loads the commit queue state from a JSON file."""
     self.queue = model.load_from_json_file(filename)
 
   def save(self, filename):
     """Save the commit queue state in a simple JSON file."""
     model.save_to_json_file(filename, self.queue)
 
   def close(self):
     """Close all the active pending manager items."""
     self.context.status.close()