Commit 11f46eb4 authored by andybons@chromium.org's avatar andybons@chromium.org

Remove reference to unused GERRIT_PORT from git_cl_test.py

BUG=579160

Review URL: https://codereview.chromium.org/1656373002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298525 0039d316-1c4b-4281-b951-d872f2087c98
parent 4c396947
...@@ -62,8 +62,7 @@ class CodereviewSettingsFileMock(object): ...@@ -62,8 +62,7 @@ class CodereviewSettingsFileMock(object):
# pylint: disable=R0201 # pylint: disable=R0201
def read(self): def read(self):
return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" + return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
"GERRIT_HOST: gerrit.chromium.org\n" + "GERRIT_HOST: True\n")
"GERRIT_PORT: 29418\n")
class AuthenticatorMock(object): class AuthenticatorMock(object):
...@@ -560,7 +559,7 @@ class TestGitCl(TestCase): ...@@ -560,7 +559,7 @@ class TestGitCl(TestCase):
((['git', 'config', 'branch.master.remote'],), 'origin'), ((['git', 'config', 'branch.master.remote'],), 'origin'),
((['get_or_create_merge_base', 'master', 'master'],), ((['get_or_create_merge_base', 'master', 'master'],),
'fake_ancestor_sha'), 'fake_ancestor_sha'),
((['git', 'config', 'gerrit.host'],), 'gerrit.example.com'), ((['git', 'config', 'gerrit.host'],), 'True'),
] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
((['git', 'rev-parse', '--show-cdup'],), ''), ((['git', 'rev-parse', '--show-cdup'],), ''),
((['git', 'rev-parse', 'HEAD'],), '12345'), ((['git', 'rev-parse', 'HEAD'],), '12345'),
...@@ -750,8 +749,7 @@ class TestGitCl(TestCase): ...@@ -750,8 +749,7 @@ class TestGitCl(TestCase):
def ParseCodereviewSettingsContent(content): def ParseCodereviewSettingsContent(content):
keyvals = {} keyvals = {}
keyvals['CODE_REVIEW_SERVER'] = 'gerrit.chromium.org' keyvals['CODE_REVIEW_SERVER'] = 'gerrit.chromium.org'
keyvals['GERRIT_HOST'] = 'gerrit.chromium.org' keyvals['GERRIT_HOST'] = 'True'
keyvals['GERRIT_PORT'] = '29418'
return keyvals return keyvals
self.mock(git_cl.gclient_utils, 'ParseCodereviewSettingsContent', self.mock(git_cl.gclient_utils, 'ParseCodereviewSettingsContent',
ParseCodereviewSettingsContent) ParseCodereviewSettingsContent)
...@@ -798,11 +796,9 @@ class TestGitCl(TestCase): ...@@ -798,11 +796,9 @@ class TestGitCl(TestCase):
'rietveld.pending-ref-prefix'],), ''), 'rietveld.pending-ref-prefix'],), ''),
((['git', 'config', '--unset-all', ((['git', 'config', '--unset-all',
'rietveld.run-post-upload-hook'],), ''), 'rietveld.run-post-upload-hook'],), ''),
((['git', 'config', 'gerrit.host', ((['git', 'config', 'gerrit.host', 'True'],), ''),
'gerrit.chromium.org'],), ''),
# DownloadHooks(False) # DownloadHooks(False)
((['git', 'config', 'gerrit.host'],), ((['git', 'config', 'gerrit.host'],), 'True'),
'gerrit.chromium.org'),
((['git', 'rev-parse', '--show-cdup'],), ''), ((['git', 'rev-parse', '--show-cdup'],), ''),
((commit_msg_path, os.X_OK,), False), ((commit_msg_path, os.X_OK,), False),
(('https://gerrit-review.googlesource.com/tools/hooks/commit-msg', (('https://gerrit-review.googlesource.com/tools/hooks/commit-msg',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment