GTTF: changes that allow testing CQ locally

commit-queue/commit_queue.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.
 """Commit queue executable.
 
 Reuse Rietveld and the Chromium Try Server to process and automatically commit
 patches.
 """
 
@@ skipping 40 matching lines @@
     if issue == self._only_issue:
       data['commit'] = True
     return data
 
   def set_flag(self, issue, patchset, flag, value):
     if issue == self._only_issue and flag == 'commit' and value == 'False':
       self._only_issue = None
     return super(OnlyIssueRietveld, self).set_flag(issue, patchset, flag, value)
 
 
-class ReadOnlyRietveld(rietveld.Rietveld):
-  def __init__(self, url, email, password, extra_headers, only_issue):
-    super(ReadOnlyRietveld, self).__init__(url, email, password, extra_headers)
-    self._only_issue = only_issue
-    self._restricted = bool(only_issue)
-
-  def _send(self, request_path, **kwargs):
-    """Ignore all post requests."""
-    if kwargs.get('payload'):
-      logging.warn('Ignoring POST to %s', request_path)
-      return
-    return super(ReadOnlyRietveld, self)._send(request_path, **kwargs)
-
-  def get_pending_issues(self):
-    """If it's set to return a single issue, only return this one."""
-    if self._restricted:
-      if self._only_issue:
-        return [self._only_issue]
-      return []
-    return super(ReadOnlyRietveld, self).get_pending_issues()
-
-  def get_issue_properties(self, issue, messages):
-    """Hacks the result to fake that the issue has the commit bit set."""
-    data = super(ReadOnlyRietveld, self).get_issue_properties(issue, messages)
-    if issue == self._only_issue:
-      data['commit'] = True
-    return data
-
-  def set_flag(self, issue, patchset, flag, value):
-    if issue == self._only_issue and flag == 'commit' and value == 'False':
-      self._only_issue = None
-    return super(ReadOnlyRietveld, self).set_flag(issue, patchset, flag, value)
-
-
 class FakeCheckout(object):
   def __init__(self):
     self.project_path = os.getcwd()
     self.project_name = os.path.basename(self.project_path)
 
   @staticmethod
   def prepare(_revision):
     logging.info('FakeCheckout is syncing')
-    return 'FAKE'
+    return unicode('FAKE')

[iannucci, 2013/09/20 23:42:53]

u'FAKE' ?

What is this fixing (I'm assuming something breaks w/o it)?

[Paweł Hajdan Jr., 2013/09/21 01:40:27]

It's fixing an exception that unicode is expected when serializing the state.

 
   @staticmethod
   def apply_patch(*_args):
     logging.info('FakeCheckout is applying a patch')
 
   @staticmethod
   def commit(*_args):
     logging.info('FakeCheckout is committing patch')
     return 'FAKED'
 
   @staticmethod
   def get_settings(_key):
     return None
 
+  @staticmethod
+  def revisions(*_args):
+    return None
+
 
 def AlertOnUncleanCheckout():
   """Sends an alert if the cq is running live with local edits."""
   diff = subprocess2.capture(['gclient', 'diff'], cwd=ROOT_DIR).strip()
   if diff:
     cq_alerts.SendAlert(
         'CQ running with local diff.',
         ('Ruh-roh! Commit queue was started with an unclean checkout.\n\n'
          '$ gclient diff\n%s' % diff))
 
@@ skipping 83 matching lines @@
   try:
     work_dir = os.path.join(ROOT_DIR, 'workdir')
     # Use our specific subversion config.
     checkout.SvnMixIn.svn_config = checkout.SvnConfig(
         os.path.join(ROOT_DIR, 'subversion_config'))
 
     url = 'https://chromiumcodereview.appspot.com'
     gaia_creds = creds.Credentials(os.path.join(work_dir, '.gaia_pwd'))
     if options.dry_run:
       logging.debug('Dry run - skipping SCM check.')
       if options.only_issue:

[Isaac (away), 2013/09/21 09:32:49]

How come we're blocking this case now?  I think the intention was that every
option is possible in read only mode before switching to commit mode.

[Paweł Hajdan Jr., 2013/09/24 02:40:43]

Isaac, do you consider this blocking the CL or just a comment?

I think for testing --only-issue doesn't really help in dry run mode. It also
doesn't reflect how CQ operates in production, so arguably the test is less
realistic.

Note that I can totally see the combination of only-issue and fake checkout
being useful. It should still work, and CQ would post comments to the real issue
but not touch the real repo.

-        print(
-            'Using read-only Rietveld; using only issue %d' %
-            options.only_issue)
+        parser.error('--only-issue is not supported with dry run')
       else:
         print('Using read-only Rietveld')
       # Make sure rietveld is not modified.
-      rietveld_obj = ReadOnlyRietveld(
+      rietveld_obj = rietveld.ReadOnlyRietveld(
           url,
           options.user,
           gaia_creds.get(options.user),
-          None,
-          options.only_issue)
+          None)
     else:
       AlertOnUncleanCheckout()
       print('WARNING: The Commit Queue is going to commit stuff')
       if options.only_issue:
         print('Using only issue %d' % options.only_issue)
         rietveld_obj = OnlyIssueRietveld(
             url,
             options.user,
             gaia_creds.get(options.user),
             None,
@@ skipping 109 matching lines @@
     return 23
   except errors.ConfigurationError as e:
     parser.error(str(e))
     return 1
   return 0
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main())