Gerrit git cl: do per CL check for Gerrit, not repo-wide.
The purpose is to allow mixed usage of Rietveld/Gerrit in the same repo.
There, a branch can use Gerrit, even though repo's default is Rietveld.
The only remaining repo-wide check GetIsGerrit is to determine codereview
for a branch which has no uploads yet.
This also simplifies future test expectations.
R=andybons@chromium.org,bauerb@chromium.org
BUG=598681
Review URL: https://codereview.chromium.org/1851663002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299603 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index df4a794..2e869a2 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -784,9 +784,6 @@
return '\n'.join(branch_deps)
self.mock(git_cl, 'RunGit', mock_run_git)
- git_cl.settings = git_cl.Settings()
- self.mock(git_cl.settings, 'GetIsGerrit', lambda: False)
-
class RecordCalls:
times_called = 0
record_calls = RecordCalls()
@@ -808,6 +805,8 @@
return '123'
def GetPatchset(self):
return '1001'
+ def IsGerrit(self):
+ return False
ret = git_cl.upload_branch_deps(MockChangelist(), [])
# CMDupload should have been called 5 times because of 5 dependent branches.