Changes to support One-Click Revert in Commit Queue

tests/try_server_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 verification/try_server.py."""
 
 import json
 import logging
 import optparse
@@ skipping 444 matching lines @@
           linux_build=linux_build, mac_build=mac_build,
           linux_state=linux_state, mac_state=mac_state,
           linux_name=linux_name, mac_name=mac_name)
 
       if is_failure(status_linux) and is_failure(status_mac):
         self.try_server.check_calls(
             [ 'builders/?select=linux&select=mac',
               'builders/linux/builds/_all', 'builders/mac/builds/_all'])
         self.context.checkout.check_calls(
             [ 'prepare(123)',
-              'apply_patch(%r)' % self.context.rietveld.patchsets[-2],
+              'apply_patch(%r, revert=False)' % (
+                  self.context.rietveld.patchsets[-2]),
               'prepare(123)',
-              'apply_patch(%r)' % self.context.rietveld.patchsets[-1]])
+              'apply_patch(%r, revert=False)' % (
+                  self.context.rietveld.patchsets[-1])])
       elif is_failure(status_linux):
         self.try_server.check_calls(
             ['builders/?select=linux', 'builders/linux/builds/_all'])
         self.context.checkout.check_calls(
             [ 'prepare(123)',
-              'apply_patch(%r)' % self.context.rietveld.patchsets[-1]])
+              'apply_patch(%r, revert=False)' % (
+                  self.context.rietveld.patchsets[-1])])
       else:
         self.try_server.check_calls(
             ['builders/?select=mac', 'builders/mac/builds/_all'])
         self.context.checkout.check_calls(
             [ 'prepare(123)',
-              'apply_patch(%r)' % self.context.rietveld.patchsets[-1]])
+              'apply_patch(%r, revert=False)' % (
+                  self.context.rietveld.patchsets[-1])])
     else:
       self.assertPending(base.SUCCEEDED, 2, None)
       self.try_server.check_calls(
           [ 'builders/?select=linux&select=mac',
             'builders/linux/builds/_all', 'builders/mac/builds/_all'])
     count = 6 + 3 * (
         int(is_failure(status_linux)) + int(is_failure(status_mac)))
     self.context.status.check_names(['try server'] * count)
 
   def testImmediateSuccess(self):
@@ skipping 202 matching lines @@
     self.assertPending(
         base.SUCCEEDED, 2, None, mac_sent=self.timestamp[1],
         linux_build=0, mac_build=0,
         mac_name='42-23 (previous was lost)')
     self.try_server.check_calls(
         ['builders/?select=mac', 'builders/mac/builds/_all'])
 
     self.try_runner.update_status([self.pending])
     self.context.checkout.check_calls(
         [ 'prepare(123)',
-          'apply_patch(%r)' % self.context.rietveld.patchsets[-1]])
+          'apply_patch(%r, revert=False)' % (
+              self.context.rietveld.patchsets[-1])])
     self.context.status.check_names(['try server'] * 7)
 
   def testFailedStepRetryLkgr(self):
     self.try_runner.verify(self.pending)
     self.try_server.check_calls(
         ['trychange b={linux:test1,test2, mac:test1,test2} c=False r=sol@123'])
     self.try_server.add_build(
         'linux', 123, None, [SUCCESS, SUCCESS, FAILURE, SUCCESS])
 
     self.lkgr = 122
     self.try_runner.update_status([self.pending])
     self.try_server.check_calls(
         [ 'builders/?select=linux&select=mac',
           'builders/linux/builds/_all', 'builders/mac/builds/_all',
           # Only the failed test is retried, on lkgr revision.
           'trychange b={linux:test1} c=False r=sol@122 n=42-23 (retry)'])
     self.assertEqual(['test1'], self.get_verif().try_jobs[0].failed_steps)
     self.context.checkout.check_calls(
         [ 'prepare(122)',
-          'apply_patch(%r)' % self.context.rietveld.patchsets[-1]])
+          'apply_patch(%r, revert=False)' % (
+              self.context.rietveld.patchsets[-1])])
     self.context.status.check_names(['try server'] * 5)
 
   def testFailedUpdate(self):
     # It must not retry a failed update.
     # Add succeededing builds, this sets quality to True, which disable retry
     # mechanism.
     self.try_server.add_build(
         'linux', 123, 'georges tried stuff',
         [SUCCESS, SUCCESS, SUCCESS, SUCCESS])
     self.try_server.add_build(
@@ skipping 26 matching lines @@
     # It must retry once a non-clobber compile.
     self.try_runner.verify(self.pending)
     self.try_server.check_calls(
         ['trychange b={linux:test1,test2, mac:test1,test2} c=False r=sol@123'])
     self.try_server.add_build(
         'linux', 123, None, [SUCCESS, FAILURE, None, None])
     self.lkgr = 122
     self.try_runner.update_status([self.pending])
     self.context.checkout.check_calls(
         [ 'prepare(122)',
-          'apply_patch(%r)' % self.context.rietveld.patchsets[-1]])
+          'apply_patch(%r, revert=False)' % (
+              self.context.rietveld.patchsets[-1])])
     self.try_server.check_calls(
         [ 'builders/?select=linux&select=mac',
           'builders/linux/builds/_all', 'builders/mac/builds/_all',
           # Retries at lkgr.
           'trychange b={linux:test1,test2} c=True r=sol@122 n=42-23 (retry)'])
     self.assertEqual(['compile'], self.get_verif().try_jobs[0].failed_steps)
     self.assertPending(
         base.PROCESSING, 2, None, linux_rev=122,
         linux_clobber=True, linux_build=None, mac_build=None,
         linux_name='42-23 (retry)')
@@ skipping 97 matching lines @@
           'linux', 123))
     self.context.status.check_names(['try server'] * 3)
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=[logging.WARNING, logging.INFO, logging.DEBUG][
         min(sys.argv.count('-v'), 2)],
       format='%(levelname)5s %(module)15s(%(lineno)3d): %(message)s')
   unittest.main()