From 1e67bb7be9d4fc810dbdeb1313578d31ad0bc866 Mon Sep 17 00:00:00 2001 From: "tandrii@chromium.org" Date: Thu, 11 Feb 2016 12:15:49 +0000 Subject: [PATCH] Gerrit git cl: run same post-upload hooks. R=rmistry@chromium.org,andybons@chromium.org BUG= Review URL: https://codereview.chromium.org/1692513002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298733 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 5 +++-- tests/git_cl_test.py | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/git_cl.py b/git_cl.py index 46e60fb20..92c6cce5b 100755 --- a/git_cl.py +++ b/git_cl.py @@ -2474,8 +2474,9 @@ def CMDupload(parser, args): options.squash = ((settings.GetSquashGerritUploads() or options.squash) and not options.no_squash) - return GerritUpload(options, args, cl, change) - ret = RietveldUpload(options, args, cl, change) + ret = GerritUpload(options, args, cl, change) + else: + ret = RietveldUpload(options, args, cl, change) if not ret: git_set_branch_value('last-upload-hash', RunGit(['rev-parse', 'HEAD']).strip()) diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index c24a4d8fe..53815f64c 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -227,6 +227,11 @@ class TestGitCl(TestCase): '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', @@ -574,8 +579,8 @@ class TestGitCl(TestCase): '+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'), @@ -640,7 +645,7 @@ class TestGitCl(TestCase): 'refs/heads/git_cl_uploads/master', 'abcdef0123456789'],), '') ] - + calls += cls._git_post_upload_calls() return calls def _run_gerrit_upload_test(