Gerrit git cl: run same post-upload hooks.

tests/git_cl_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 git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 209 matching lines @@
          (('', None), 0)),
         ((['git', 'rev-parse', '--show-cdup'],), ''),
         ((['git', 'svn', 'info'],), ''),
         ((['git', 'config', 'rietveld.project'],), ''),
         ((['git',
            'config', 'branch.master.rietveldissue', '1'],), ''),
         ((['git', 'config', 'branch.master.rietveldserver',
            'https://codereview.example.com'],), ''),
         ((['git',
            'config', 'branch.master.rietveldpatchset', '2'],), ''),
+    ] + cls._git_post_upload_calls()
+
+  @classmethod
+  def _git_post_upload_calls(cls):
+    return [
         ((['git', 'rev-parse', 'HEAD'],), 'hash'),
         ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
         ((['git',
            'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
         ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
     ]
 
   @staticmethod
   def _git_sanity_checks(diff_base, working_branch):
     fake_ancestor = 'fake_ancestor'
@@ skipping 327 matching lines @@
         ((['git',
            'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
          'foo'),
         ((['git', 'config', 'user.email'],), 'me@example.com'),
         ((['git',
            'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
            '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
          '+dat'),
         ]
 
-  @staticmethod
-  def _gerrit_upload_calls(description, reviewers, squash,
+  @classmethod
+  def _gerrit_upload_calls(cls, description, reviewers, squash,
                            expected_upstream_ref='origin/refs/heads/master'):
     calls = [
         ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
         ((['git', 'log', '--pretty=format:%s\n\n%b',
            'fake_ancestor_sha..HEAD'],),
          description)
         ]
     if git_cl.CHANGE_ID not in description:
       calls += [
           ((['git', 'log', '--pretty=format:%s\n\n%b',
@@ skipping 44 matching lines @@
            ref_to_push + ':refs/for/refs/heads/master'],),
          '')
         ]
     if squash:
       calls += [
           ((['git', 'rev-parse', 'HEAD'],), 'abcdef0123456789'),
           ((['git', 'update-ref', '-m', 'Uploaded abcdef0123456789',
             'refs/heads/git_cl_uploads/master', 'abcdef0123456789'],),
            '')
           ]
-
+    calls += cls._git_post_upload_calls()
     return calls
 
   def _run_gerrit_upload_test(
       self,
       upload_args,
       description,
       reviewers,
       squash=False,
       expected_upstream_ref='origin/refs/heads/master'):
     """Generic gerrit upload test framework."""
@@ skipping 295 matching lines @@
     self.calls += [
       ((['git', 'apply', '--index', '-p0', '--3way'],), '',
        subprocess2.CalledProcessError(1, '', '', '', '')),
     ]
     self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()