git-cl: Remove ChangeListImplementation boilerplate.
Change-Id: I880c60e4b4e07fdb68a63af8d7a171d54371ee71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1802294
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index ee9be6d..9c2bdef 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -157,7 +157,7 @@
cl = git_cl.Changelist(issue=1, codereview_host='host')
cl.description = 'x'
cl.has_description = True
- cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
+ cl.FetchDescription = lambda *a, **kw: 'y'
self.assertEquals(cl.GetDescription(), 'x')
self.assertEquals(cl.GetDescription(force=True), 'y')
self.assertEquals(cl.GetDescription(), 'y')
@@ -174,7 +174,7 @@
'Awesome: Footers',
])
cl.has_description = True
- cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
+ cl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
msg, footers = cl.GetDescriptionFooters()
self.assertEquals(
msg, ['This is some message', '', 'It has some lines', 'and, also'])
@@ -489,7 +489,7 @@
def test_gerrit(self):
def test(url, *args, **kwargs):
- self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
+ self._run_and_validate(git_cl.Changelist.ParseIssueURL, url,
*args, **kwargs)
test('http://chrome-review.source.com/c/123',
@@ -1253,7 +1253,7 @@
self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
CookiesAuthenticatorMockFactory(
same_auth=('git-owner.example.com', '', 'pass')))
- self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
+ self.mock(git_cl.Changelist, '_GerritCommitMsgHookCheck',
lambda _, offer_removal: None)
self.mock(git_cl.gclient_utils, 'RunEditor',
lambda *_, **__: self._mocked_call(['RunEditor']))
@@ -1724,7 +1724,7 @@
git_short_host='host',
detect_branch=True,
detect_server=True):
- """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
+ """Returns calls executed by Changelist.GetCodereviewServer.
If value is given, branch.<BRANCH>.gerritcodereview is already set.
"""
@@ -2177,7 +2177,7 @@
self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
self.mock(git_cl.Changelist, 'GetDescription',
lambda *args: current_desc)
- self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
+ self.mock(git_cl.Changelist, 'UpdateDescriptionRemote',
UpdateDescriptionRemote)
self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
@@ -2328,7 +2328,7 @@
self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
lambda *_, **__: (
self._mocked_call(['DoGetTryMasters'])))
- self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
+ self.mock(git_cl.Changelist, 'SetCQState',
lambda _, s: self._mocked_call(['SetCQState', s]))
self.calls = [
@@ -2368,7 +2368,7 @@
'', '', '', '', '', '', '', '')),
((['git', 'rev-parse', '--show-cdup'],), '../'),
((['DoGetTryMasters'], ), None),
- ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
+ ((['SetCQState', git_cl._CQState.DRY_RUN], ), 0),
]
out = StringIO.StringIO()
self.mock(git_cl.sys, 'stdout', out)
@@ -2483,14 +2483,14 @@
((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
'#!/bin/sh\necho "custom hook"')
]
- cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
+ cl._GerritCommitMsgHookCheck(offer_removal=True)
def test_GerritCommitMsgHookCheck_not_exists(self):
cl = self._common_GerritCommitMsgHookCheck()
self.calls += [
((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
]
- cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
+ cl._GerritCommitMsgHookCheck(offer_removal=True)
def test_GerritCommitMsgHookCheck(self):
cl = self._common_GerritCommitMsgHookCheck()
@@ -2502,7 +2502,7 @@
((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
''),
]
- cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
+ cl._GerritCommitMsgHookCheck(offer_removal=True)
def test_GerritCmdLand(self):
self.calls += [
@@ -2514,16 +2514,16 @@
'chromium-review.googlesource.com'),
]
cl = git_cl.Changelist(issue=123)
- cl._codereview_impl._GetChangeDetail = lambda _: {
+ cl._GetChangeDetail = lambda *args, **kwargs: {
'labels': {},
'current_revision': 'deadbeaf',
}
- cl._codereview_impl._GetChangeCommit = lambda: {
+ cl._GetChangeCommit = lambda: {
'commit': 'deadbeef',
'web_links': [{'name': 'gitiles',
'url': 'https://git.googlesource.com/test/+/deadbeef'}],
}
- cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
+ cl.SubmitIssue = lambda wait_for_merge: None
out = StringIO.StringIO()
self.mock(sys, 'stdout', out)
self.assertEqual(0, cl.CMDLand(force=True,
@@ -2671,7 +2671,7 @@
self.assertRegexpMatches(sys.stdout.getvalue(), '2 tryjobs')
def _mock_gerrit_changes_for_detail_cache(self):
- self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
+ self.mock(git_cl.Changelist, '_GetGerritHost', lambda _: 'host')
def test_gerrit_change_detail_cache_simple(self):
self._mock_gerrit_changes_for_detail_cache()