Changes to support One-Click Revert in Commit Queue

tests/project_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.
 
 """Integration tests for project.py."""
 
 import logging
 import os
 import random
@@ skipping 107 matching lines @@
     root_dir = os.path.join(os.getcwd(), 'root_dir')
     chromium_status_pwd = os.path.join(root_dir, '.chromium_status_pwd')
     skia_status_pwd = os.path.join(root_dir, '.skia_status_pwd')
     mapping = {
       'blink': {
         'lines': [
           chromium_status_pwd, 'chromium-status password', ['foo'],
         ],
         'pre_patch_verifiers': ['project_bases', 'reviewer_lgtm'],
         'verifiers': ['try job rietveld', 'tree status'],
+        'pre_patch_revert_verifiers': [],
+        'revert_verifiers': []
       },
       'chromium': {
         'lines': [
           chromium_status_pwd, 'chromium-status password', ['foo'],
         ],
         'pre_patch_verifiers': ['project_bases', 'reviewer_lgtm'],
         'verifiers': ['try job rietveld', 'tree status'],
+        'pre_patch_revert_verifiers': [],
+        'revert_verifiers': []
       },
       'chromium_deps': {
         'lines': [
           chromium_status_pwd, 'chromium-status password', ['foo'],
         ],
         'pre_patch_verifiers': ['project_bases', 'reviewer_lgtm'],
         'verifiers': ['presubmit'],
+        'pre_patch_revert_verifiers': [],
+        'revert_verifiers': []
       },
       'gyp': {
         'lines': [
           chromium_status_pwd, 'chromium-status password', ['foo'],
         ],
         'pre_patch_verifiers': ['project_bases', 'reviewer_lgtm'],
         'verifiers': ['tree status'],
+        'pre_patch_revert_verifiers': [],
+        'revert_verifiers': []
       },
       'nacl': {
         'lines': [
           chromium_status_pwd, 'chromium-status password', ['foo'],
         ],
         'pre_patch_verifiers': ['project_bases', 'reviewer_lgtm'],
         'verifiers': ['presubmit', 'tree status'],
+        'pre_patch_revert_verifiers': [],
+        'revert_verifiers': []
       },
       'skia': {
         'lines': [
           skia_status_pwd, 'skia-status password', ['foo'],
         ],
         'pre_patch_verifiers': ['project_bases', 'reviewer_lgtm'],
         'verifiers': ['presubmit', 'tree status'],
+        'pre_patch_revert_verifiers': ['project_bases', 'committer_revert'],
+        'revert_verifiers': []
       },
       'tools': {
         'lines': [
           chromium_status_pwd, 'chromium-status password', ['foo'],
         ],
         'pre_patch_verifiers': ['project_bases', 'reviewer_lgtm'],
         'verifiers': ['presubmit'],
+        'pre_patch_revert_verifiers': [],
+        'revert_verifiers': []
       },
     }
     for project in sorted(projects.supported_projects()):
       logging.debug(project)
       self.assertEqual([], self.read_lines)
       expected = mapping.pop(project)
       self.read_lines = [expected['lines']]
       p = projects.load_project(
           project, 'user', root_dir, self.context.rietveld, True)
       self.assertEqual(
           expected['pre_patch_verifiers'],
           [x.name for x in p.pre_patch_verifiers],
           (expected['pre_patch_verifiers'],
            [x.name for x in p.pre_patch_verifiers],
            project))
       self.assertEqual(
           expected['verifiers'], [x.name for x in p.verifiers],
           (expected['verifiers'],
            [x.name for x in p.verifiers],
            project))
+      self.assertEqual(
+          expected['pre_patch_revert_verifiers'],
+          [x.name for x in p.pre_patch_revert_verifiers],
+          (expected['pre_patch_revert_verifiers'],
+           [x.name for x in p.pre_patch_revert_verifiers],
+           project))
+      self.assertEqual(
+          expected['revert_verifiers'], [x.name for x in p.revert_verifiers],
+          (expected['revert_verifiers'],
+           [x.name for x in p.revert_verifiers],
+           project))
       if project == 'tools':
         # Add special checks for it.
         project_bases_verifier = p.pre_patch_verifiers[0]
         branch = '\\@[a-zA-Z0-9\\-_\\.]+$'
         self.assertEqual(
             [
               # svn
               '^svn\\:\\/\\/svn\\.chromium\\.org\\/chrome/trunk/tools(|/.*)$',
               '^svn\\:\\/\\/chrome\\-svn\\/chrome/trunk/tools(|/.*)$',
               '^svn\\:\\/\\/chrome\\-svn\\.corp\\/chrome/trunk/tools(|/.*)$',
@@ skipping 282 matching lines @@
     self.context.rietveld.check_calls([
       _try_comment(pc),
       "trigger_try_jobs(31337, 1, 'CQ', False, 'HEAD', "
           "{u'chromium_presubmit': ['presubmit']})",
       'close_issue(31337)',
       "update_description(31337, u'foo\\nTBR=')",
       "add_comment(31337, 'Change committed as 125')",
       ])
     self.context.checkout.check_calls([
       'prepare(None)',
-      'apply_patch(%r)' % self.context.rietveld.patchsets[0],
+      'apply_patch(%r, revert=False)' % self.context.rietveld.patchsets[0],
       'prepare(None)',
-      'apply_patch(%r)' % self.context.rietveld.patchsets[1],
+      'apply_patch(%r, revert=False)' % self.context.rietveld.patchsets[1],
       "commit(u'foo\\nTBR=\\n\\nReview URL: http://nowhere/31337', "
           "u'user@example.com')",
       ])
     self.context.status.check_names(['initial', 'why not', 'why not',
                                      'why not', 'commit'])
 
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.WARNING,
       format='%(levelname)5s %(module)15s(%(lineno)3d): %(message)s')
   unittest.main()