Change the CQ code to update R= line as done in depot_tools.

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 81 matching lines @@
     self.assertEquals(len(pc.queue.iterate()), 0)
     issue = 31337
     if pc.verifiers:
       if success:
         self.context.checkout.check_calls(
             [ 'prepare(None)',
               'apply_patch(%r)' % (self.context.rietveld.patchsets[0],),
               'prepare(None)',  # Will sync to HEAD/124.
               'apply_patch(%r)' % (self.context.rietveld.patchsets[1],),
               (
-                "commit(u'foo\\n\\n"
+                "commit(u'foo\\n\\nR=rev@example.com\\n\\n"
                 "Review URL: http://nowhere/%d', "
                 "u'author@example.com')") % issue])
         self.context.rietveld.check_calls(
             [ _try_comment(),
               'close_issue(%d)' % issue,
-              "update_description(%d, u'foo')" % issue,
+              "update_description(%d, u'foo\\n\\nR=rev@example.com')" % 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, 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,
+              "update_description(%d, u'foo\\n\\nR=rev@example.com')" % 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, pc.FAILED_NO_MESSAGE)])
         else:
@@ skipping 11 matching lines @@
       # Reverts any previous modification or checkout the tree if it was not
       # present.
       'prepare(None)',
       # Applies the requested PatchSet.
       'apply_patch(%r)' % self.context.rietveld.patchsets[index],
     ]
     # Commits the patch.
     author_and_reviewer = ''
     if server_hooks_missing:
       author_and_reviewer = (
-          '\\n\\nR=rev@example.com\\n\\nAuthor: author@example.com')
+          '\\n\\nAuthor: author@example.com')
     commit_message = (
-        "commit(u'foo%s\\n\\n"
+        "commit(u'foo\\n\\nR=rev@example.com%s\\n\\n"
         "Review URL: http://nowhere/%d', "
         "u'author@example.com')") % (author_and_reviewer, issue)
     seq.append(commit_message)
 
     return seq
 
   def testNoVerification(self):
     try:
       # Need at least one verification.
       self._get_pc([], [])
@@ skipping 268 matching lines @@
           'apply_patch(%r)' % (self.context.rietveld.patchsets[0],)])
     pc.update_status()
     self.context.checkout.check_calls([])
     pc.scan_results()
     self.context.checkout.check_calls(
         # Will sync to HEAD, 124.
         self._prepare_apply_commit(1, issue))
     self.context.rietveld.check_calls(
         [ _try_comment(),
           'close_issue(%d)' % issue,
-          "update_description(%d, u'foo')" % issue,
+          "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
           "add_comment(%d, 'Change committed as 125')" % issue])
     self.context.status.check_names(['initial', 'why not', 'commit'])
 
   def testCommitBurst(self):
     issue = 31337
     pc = self._get_pc([fake.FakeVerifier(base.SUCCEEDED)], [])
     self.assertEquals(4, pc.MAX_COMMIT_BURST)
     timestamp = [1]
     self.mock(time, 'time', lambda: timestamp[-1])
     for i in range(pc.MAX_COMMIT_BURST + 2):
@@ skipping 12 matching lines @@
         self._prepare_apply_commit(3, 3))
     self.context.rietveld.check_calls(
         [ _try_comment(0),
           _try_comment(1),
           _try_comment(2),
           _try_comment(3),
           _try_comment(4),
           _try_comment(5),
           _try_comment(),
           'close_issue(0)',
-          "update_description(0, u'foo')",
+          "update_description(0, u'foo\\n\\nR=rev@example.com')",
           "add_comment(0, 'Change committed as 125')",
           'close_issue(1)',
-          "update_description(1, u'foo')",
+          "update_description(1, u'foo\\n\\nR=rev@example.com')",
           "add_comment(1, 'Change committed as 125')",
           'close_issue(2)',
-          "update_description(2, u'foo')",
+          "update_description(2, u'foo\\n\\nR=rev@example.com')",
           "add_comment(2, 'Change committed as 125')",
           'close_issue(3)',
-          "update_description(3, u'foo')",
+          "update_description(3, u'foo\\n\\nR=rev@example.com')",
           "add_comment(3, 'Change committed as 125')",
         ])
     self.assertEquals(3, len(pc.queue.iterate()))
     total = pc.MAX_COMMIT_BURST + 3
     self.context.status.check_names(['initial'] * total +
                                     (['why not', 'commit'] *
                                      pc.MAX_COMMIT_BURST) +
                                     ['why not'] * 3)
 
     # Dry run.
     pc.scan_results()
     self.context.checkout.check_calls([])
     self.context.rietveld.check_calls([])
     self.context.status.check_names(['why not'] * 3)
 
     # Remove one item from the burst.
     pc.recent_commit_timestamps.pop()
     pc.scan_results()
     next_item = pc.MAX_COMMIT_BURST
     self.context.checkout.check_calls(
         self._prepare_apply_commit(next_item, next_item))
     self.context.rietveld.check_calls(
         [ 'close_issue(%d)' % next_item,
-          "update_description(%d, u'foo')" % next_item,
+          "update_description(%d, u'foo\\n\\nR=rev@example.com')" % next_item,
           "add_comment(%d, 'Change committed as 125')" % next_item,
         ])
     self.context.status.check_names(['why not', 'commit'] + ['why not'] * 2)
     # After a delay, must flush the queue.
     timestamp.append(timestamp[-1] + pc.COMMIT_BURST_DELAY + 1)
     pc.scan_results()
     self.context.checkout.check_calls(
         self._prepare_apply_commit(next_item + 1, next_item + 1) +
         self._prepare_apply_commit(next_item + 2, issue))
     self.context.rietveld.check_calls(
         [ 'close_issue(%d)' % (next_item + 1),
-          "update_description(%d, u'foo')" % (next_item + 1),
+          "update_description(%d, u'foo\\n\\nR=rev@example.com')" %
+            (next_item + 1),
           "add_comment(%d, 'Change committed as 125')" % (next_item + 1),
           'close_issue(%d)' % issue,
-          "update_description(%d, u'foo')" % issue,
+          "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
           "add_comment(%d, 'Change committed as 125')" % issue])
     self.context.status.check_names(['why not', 'commit'] * 2)
 
   def testIgnored(self):
     issue = 31337
     verifiers = [
         project_base.ProjectBaseUrlVerifier(
           [r'^%s(.*)$' % re.escape(r'http://example.com/')]),
     ]
     pc = self._get_pc(verifiers, [])
@@ skipping 15 matching lines @@
     self.context.server_hooks_missing = True
     pc = self._get_pc(verifiers, [])
     pc.context.rietveld.issues[issue]['base_url'] = 'http://example.com/'
     pc.look_for_new_pending_commit()
     pc.process_new_pending_commit()
     pc.update_status()
     pc.scan_results()
     self.context.rietveld.check_calls(
         [ _try_comment(),
           'close_issue(%d)' % issue,
-          "update_description(%d, u'foo')" % issue,
+          "update_description(%d, u'foo\\n\\nR=rev@example.com')" % 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 testDisapeared(self):
     issue = 31337
     verifiers = [
         project_base.ProjectBaseUrlVerifier(
           [r'^%s(.*)$' % re.escape(r'http://example.com/')]),
@@ skipping 59 matching lines @@
     self.assertEquals(1, len(pc.queue.iterate()))
     pc.process_new_pending_commit()
     self.assertEquals(1, len(pc.queue.iterate()))
     pc.update_status()
     self.assertEquals(1, len(pc.queue.iterate()))
     pc.scan_results()
     self.assertEquals(0, len(pc.queue.iterate()))
     self.context.rietveld.check_calls(
         [ _try_comment(),
           'close_issue(%d)' % issue,
-          "update_description(%d, u'foo')" % issue,
+          "update_description(%d, u'foo\\n\\nR=rev@example.com')" % 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))
 
   def testDriveBy(self):
     issue = 31337
     pc = self._get_pc_reviewer()
     self._approve()
     pc.look_for_new_pending_commit()
@@ skipping 19 matching lines @@
     pc.update_status()
     # He's nice, he left a LGTM.
     i = self.context.rietveld.issues[issue]
     i['reviewers'] = i['reviewers'] + ['nice@dude.org']
     self._approve('nice@dude.org')
     pc.scan_results()
     self.assertEquals(0, len(pc.queue.iterate()))
     self.context.rietveld.check_calls(
         [ _try_comment(),
           'close_issue(%d)' % issue,
-          "update_description(%d, u'foo')" % issue,
+          "update_description(%d, u'foo\\n\\nR=rev@example.com')" % 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))
 
   def testWhyNotUpdates(self):
     issue = 31337
     fake1_change = 1
     fake1 = fake.DeferredFakeVerifier(base.SUCCEEDED, fake1_change)
     fake1.name = 'fake1'
@@ skipping 11 matching lines @@
     for i in range(fake2_change * 2):
       expected = ['why not'] if fake1_change == i or fake2_change == i else []
       pc.update_status()
       self.context.status.check_names(expected)
 
     pc.scan_results()
 
     self.context.rietveld.check_calls(
       [_try_comment(),
        'close_issue(%d)' % issue,
-       "update_description(%d, u'foo')" % issue,
+       "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
        "add_comment(%d, 'Change committed as 125')" % issue])
     self.context.status.check_names(['why not', 'commit'])
     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()