| #!/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 contextlib |
| import datetime |
| import json |
| import logging |
| import os |
| import StringIO |
| import sys |
| import unittest |
| import urlparse |
| |
| sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
| |
| from testing_support.auto_stub import TestCase |
| |
| import git_cl |
| import git_common |
| import git_footers |
| import subprocess2 |
| |
| def callError(code=1, cmd='', cwd='', stdout='', stderr=''): |
| return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr) |
| |
| |
| CERR1 = callError(1) |
| |
| |
| class ChangelistMock(object): |
| # A class variable so we can access it when we don't have access to the |
| # instance that's being set. |
| desc = "" |
| def __init__(self, **kwargs): |
| pass |
| def GetIssue(self): |
| return 1 |
| def GetDescription(self, force=False): |
| return ChangelistMock.desc |
| def UpdateDescription(self, desc, force=False): |
| ChangelistMock.desc = desc |
| |
| |
| class PresubmitMock(object): |
| def __init__(self, *args, **kwargs): |
| self.reviewers = [] |
| @staticmethod |
| def should_continue(): |
| return True |
| |
| |
| class RietveldMock(object): |
| def __init__(self, *args, **kwargs): |
| pass |
| |
| @staticmethod |
| def get_description(issue, force=False): |
| return 'Issue: %d' % issue |
| |
| @staticmethod |
| def get_issue_properties(_issue, _messages): |
| return { |
| 'reviewers': ['[email protected]', '[email protected]'], |
| 'messages': [ |
| { |
| 'approval': True, |
| 'disapproval': False, |
| 'sender': '[email protected]', |
| }, |
| ], |
| 'patchsets': [1, 20001], |
| } |
| |
| @staticmethod |
| def close_issue(_issue): |
| return 'Closed' |
| |
| @staticmethod |
| def get_patch(issue, patchset): |
| return 'patch set from issue %s patchset %s' % (issue, patchset) |
| |
| @staticmethod |
| def update_description(_issue, _description): |
| return 'Updated' |
| |
| @staticmethod |
| def add_comment(_issue, _comment): |
| return 'Commented' |
| |
| |
| |
| |
| class GitCheckoutMock(object): |
| def __init__(self, *args, **kwargs): |
| pass |
| |
| @staticmethod |
| def reset(): |
| GitCheckoutMock.conflict = False |
| |
| def apply_patch(self, p): |
| if GitCheckoutMock.conflict: |
| raise Exception('failed') |
| |
| |
| class WatchlistsMock(object): |
| def __init__(self, _): |
| pass |
| @staticmethod |
| def GetWatchersForPaths(_): |
| return ['[email protected]'] |
| |
| |
| class CodereviewSettingsFileMock(object): |
| def __init__(self): |
| pass |
| # pylint: disable=no-self-use |
| def read(self): |
| return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" + |
| "GERRIT_HOST: True\n") |
| |
| |
| class AuthenticatorMock(object): |
| def __init__(self, *_args): |
| pass |
| def has_cached_credentials(self): |
| return True |
| def authorize(self, http): |
| return http |
| |
| |
| def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False): |
| """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies. |
| |
| Usage: |
| >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
| CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')}) |
| |
| OR |
| >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
| CookiesAuthenticatorMockFactory( |
| same_auth=('user', '', 'pass')) |
| """ |
| class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator): |
| def __init__(self): # pylint: disable=super-init-not-called |
| # Intentionally not calling super() because it reads actual cookie files. |
| pass |
| @classmethod |
| def get_gitcookies_path(cls): |
| return '~/.gitcookies' |
| @classmethod |
| def get_netrc_path(cls): |
| return '~/.netrc' |
| def _get_auth_for_host(self, host): |
| if same_auth: |
| return same_auth |
| return (hosts_with_creds or {}).get(host) |
| return CookiesAuthenticatorMock |
| |
| class MockChangelistWithBranchAndIssue(): |
| def __init__(self, branch, issue): |
| self.branch = branch |
| self.issue = issue |
| def GetBranch(self): |
| return self.branch |
| def GetIssue(self): |
| return self.issue |
| |
| |
| class SystemExitMock(Exception): |
| pass |
| |
| |
| class TestGitClBasic(unittest.TestCase): |
| def test_get_description(self): |
| cl = git_cl.Changelist(issue=1, codereview='rietveld', |
| codereview_host='host') |
| cl.description = 'x' |
| cl.has_description = True |
| cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y' |
| self.assertEquals(cl.GetDescription(), 'x') |
| self.assertEquals(cl.GetDescription(force=True), 'y') |
| self.assertEquals(cl.GetDescription(), 'y') |
| |
| def test_description_footers(self): |
| cl = git_cl.Changelist(issue=1, codereview='gerrit', |
| codereview_host='host') |
| cl.description = '\n'.join([ |
| 'This is some message', |
| '', |
| 'It has some lines', |
| 'and, also', |
| '', |
| 'Some: Really', |
| 'Awesome: Footers', |
| ]) |
| cl.has_description = True |
| cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y' |
| msg, footers = cl.GetDescriptionFooters() |
| self.assertEquals( |
| msg, ['This is some message', '', 'It has some lines', 'and, also']) |
| self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')]) |
| |
| msg.append('wut') |
| footers.append(('gnarly-dude', 'beans')) |
| cl.UpdateDescriptionFooters(msg, footers) |
| self.assertEquals(cl.GetDescription().splitlines(), [ |
| 'This is some message', |
| '', |
| 'It has some lines', |
| 'and, also', |
| 'wut' |
| '', |
| 'Some: Really', |
| 'Awesome: Footers', |
| 'Gnarly-Dude: beans', |
| ]) |
| |
| def test_get_bug_line_values(self): |
| f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs)) |
| self.assertEqual(f('', ''), []) |
| self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456']) |
| self.assertEqual(f('v8', '456'), ['v8:456']) |
| self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123']) |
| # Not nice, but not worth carying. |
| self.assertEqual(f('v8', 'chromium:123,456,v8:123'), |
| ['v8:456', 'chromium:123', 'v8:123']) |
| |
| def _test_git_number(self, parent_msg, dest_ref, child_msg, |
| parent_hash='parenthash'): |
| desc = git_cl.ChangeDescription(child_msg) |
| desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref) |
| return desc.description |
| |
| def assertEqualByLine(self, actual, expected): |
| self.assertEqual(actual.splitlines(), expected.splitlines()) |
| |
| def test_git_number_bad_parent(self): |
| with self.assertRaises(ValueError): |
| self._test_git_number('Parent', 'refs/heads/master', 'Child') |
| |
| def test_git_number_bad_parent_footer(self): |
| with self.assertRaises(AssertionError): |
| self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: wrong', |
| 'refs/heads/master', 'Child') |
| |
| def test_git_number_bad_lineage_ignored(self): |
| actual = self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#1}\n' |
| 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}', |
| 'refs/heads/master', 'Child') |
| self.assertEqualByLine( |
| actual, |
| 'Child\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#2}\n' |
| 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}') |
| |
| def test_git_number_same_branch(self): |
| actual = self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#12}', |
| dest_ref='refs/heads/master', |
| child_msg='Child') |
| self.assertEqualByLine( |
| actual, |
| 'Child\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#13}') |
| |
| def test_git_number_same_branch_with_originals(self): |
| actual = self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#12}', |
| dest_ref='refs/heads/master', |
| child_msg='Child\n' |
| '\n' |
| 'Some users are smart and insert their own footers\n' |
| '\n' |
| 'Cr-Whatever: value\n' |
| 'Cr-Commit-Position: refs/copy/paste@{#22}') |
| self.assertEqualByLine( |
| actual, |
| 'Child\n' |
| '\n' |
| 'Some users are smart and insert their own footers\n' |
| '\n' |
| 'Cr-Original-Whatever: value\n' |
| 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n' |
| 'Cr-Commit-Position: refs/heads/master@{#13}') |
| |
| def test_git_number_new_branch(self): |
| actual = self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#12}', |
| dest_ref='refs/heads/branch', |
| child_msg='Child') |
| self.assertEqualByLine( |
| actual, |
| 'Child\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 'Cr-Branched-From: parenthash-refs/heads/master@{#12}') |
| |
| def test_git_number_lineage(self): |
| actual = self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| dest_ref='refs/heads/branch', |
| child_msg='Child') |
| self.assertEqualByLine( |
| actual, |
| 'Child\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/branch@{#2}\n' |
| 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| |
| def test_git_number_moooooooore_lineage(self): |
| actual = self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/branch@{#5}\n' |
| 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| dest_ref='refs/heads/mooore', |
| child_msg='Child') |
| self.assertEqualByLine( |
| actual, |
| 'Child\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/mooore@{#1}\n' |
| 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n' |
| 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| |
| def test_git_number_ever_moooooooore_lineage(self): |
| self.maxDiff = 10000 |
| actual = self._test_git_number( |
| 'CQ commit on fresh new branch + numbering.\n' |
| '\n' |
| 'NOTRY=True\n' |
| 'NOPRESUBMIT=True\n' |
| 'BUG=\n' |
| '\n' |
| 'Review-Url: https://codereview.chromium.org/2577703003\n' |
| 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n' |
| 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n' |
| 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}', |
| dest_ref='refs/heads/gnumb-test/cl', |
| child_msg='git cl on fresh new branch + numbering.\n' |
| '\n' |
| 'Review-Url: https://codereview.chromium.org/2575043003 .\n') |
| self.assertEqualByLine( |
| actual, |
| 'git cl on fresh new branch + numbering.\n' |
| '\n' |
| 'Review-Url: https://codereview.chromium.org/2575043003 .\n' |
| 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n' |
| 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n' |
| 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n' |
| 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}') |
| |
| def test_git_number_cherry_pick(self): |
| actual = self._test_git_number( |
| 'Parent\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| dest_ref='refs/heads/branch', |
| child_msg='Child, which is cherry-pick from master\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#100}\n' |
| '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)') |
| self.assertEqualByLine( |
| actual, |
| 'Child, which is cherry-pick from master\n' |
| '\n' |
| '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n' |
| '\n' |
| 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n' |
| 'Cr-Commit-Position: refs/heads/branch@{#2}\n' |
| 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| |
| |
| class TestParseIssueURL(unittest.TestCase): |
| def _validate(self, parsed, issue=None, patchset=None, hostname=None, |
| codereview=None, fail=False): |
| self.assertIsNotNone(parsed) |
| if fail: |
| self.assertFalse(parsed.valid) |
| return |
| self.assertTrue(parsed.valid) |
| self.assertEqual(parsed.issue, issue) |
| self.assertEqual(parsed.patchset, patchset) |
| self.assertEqual(parsed.hostname, hostname) |
| self.assertEqual(parsed.codereview, codereview) |
| |
| def _run_and_validate(self, func, url, *args, **kwargs): |
| result = func(urlparse.urlparse(url)) |
| if kwargs.pop('fail', False): |
| self.assertIsNone(result) |
| return None |
| self._validate(result, *args, fail=False, **kwargs) |
| |
| def test_rietveld(self): |
| def test(url, *args, **kwargs): |
| self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url, |
| *args, codereview='rietveld', **kwargs) |
| |
| test('http://codereview.chromium.org/123', |
| 123, None, 'codereview.chromium.org') |
| test('https://codereview.chromium.org/123', |
| 123, None, 'codereview.chromium.org') |
| test('https://codereview.chromium.org/123/', |
| 123, None, 'codereview.chromium.org') |
| test('https://codereview.chromium.org/123/whatever', |
| 123, None, 'codereview.chromium.org') |
| test('https://codereview.chromium.org/123/#ps20001', |
| 123, 20001, 'codereview.chromium.org') |
| test('http://codereview.chromium.org/download/issue123_4.diff', |
| 123, 4, 'codereview.chromium.org') |
| # This looks like bad Gerrit, but is actually valid Rietveld, too. |
| test('https://chrome-review.source.com/123/4/', |
| 123, None, 'chrome-review.source.com') |
| |
| test('https://codereview.chromium.org/deadbeaf', fail=True) |
| test('https://codereview.chromium.org/api/123', fail=True) |
| test('bad://codereview.chromium.org/123', fail=True) |
| test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True) |
| |
| def test_gerrit(self): |
| def test(url, issue=None, patchset=None, hostname=None, fail=None): |
| self._test_ParseIssueUrl( |
| git_cl._GerritChangelistImpl.ParseIssueURL, |
| url, issue, patchset, hostname, fail) |
| def test(url, *args, **kwargs): |
| self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url, |
| *args, codereview='gerrit', **kwargs) |
| |
| test('http://chrome-review.source.com/c/123', |
| 123, None, 'chrome-review.source.com') |
| test('https://chrome-review.source.com/c/123/', |
| 123, None, 'chrome-review.source.com') |
| test('https://chrome-review.source.com/c/123/4', |
| 123, 4, 'chrome-review.source.com') |
| test('https://chrome-review.source.com/#/c/123/4', |
| 123, 4, 'chrome-review.source.com') |
| test('https://chrome-review.source.com/c/123/4', |
| 123, 4, 'chrome-review.source.com') |
| test('https://chrome-review.source.com/123', |
| 123, None, 'chrome-review.source.com') |
| test('https://chrome-review.source.com/123/4', |
| 123, 4, 'chrome-review.source.com') |
| |
| test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True) |
| test('https://chrome-review.source.com/c/abc/', fail=True) |
| test('ssh://chrome-review.source.com/c/123/1/', fail=True) |
| |
| def test_ParseIssueNumberArgument(self): |
| def test(arg, *args, **kwargs): |
| codereview_hint = kwargs.pop('hint', None) |
| self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint), |
| *args, **kwargs) |
| |
| test('123', 123) |
| test('', fail=True) |
| test('abc', fail=True) |
| test('123/1', fail=True) |
| test('123a', fail=True) |
| test('ssh://chrome-review.source.com/#/c/123/4/', fail=True) |
| # Rietveld. |
| test('https://codereview.source.com/www123', fail=True) |
| # Matches both, but we take Rietveld now by default. |
| test('https://codereview.source.com/123', |
| 123, None, 'codereview.source.com', 'rietveld') |
| # Matches both, but we take Gerrit if specifically requested. |
| test('https://codereview.source.com/123', |
| 123, None, 'codereview.source.com', 'gerrit', |
| hint='gerrit') |
| # Gerrrit. |
| test('https://chrome-review.source.com/c/123/4', |
| 123, 4, 'chrome-review.source.com', 'gerrit') |
| test('https://chrome-review.source.com/bad/123/4', fail=True) |
| |
| |
| class GitCookiesCheckerTest(TestCase): |
| def setUp(self): |
| super(GitCookiesCheckerTest, self).setUp() |
| self.c = git_cl._GitCookiesChecker() |
| self.c._all_hosts = [] |
| |
| def mock_hosts_creds(self, subhost_identity_pairs): |
| def ensure_googlesource(h): |
| if not h.endswith(self.c._GOOGLESOURCE): |
| assert not h.endswith('.') |
| return h + '.' + self.c._GOOGLESOURCE |
| return h |
| self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies') |
| for h, i in subhost_identity_pairs] |
| |
| def test_analysis_nothing(self): |
| self.c._all_hosts = [] |
| self.assertFalse(self.c.has_generic_host()) |
| self.assertEqual(set(), self.c.get_conflicting_hosts()) |
| self.assertEqual(set(), self.c.get_duplicated_hosts()) |
| self.assertEqual(set(), self.c.get_partially_configured_hosts()) |
| self.assertEqual(set(), self.c.get_hosts_with_wrong_identities()) |
| |
| def test_analysis(self): |
| self.mock_hosts_creds([ |
| ('.googlesource.com', 'git-example.chromium.org'), |
| |
| ('chromium', 'git-example.google.com'), |
| ('chromium-review', 'git-example.google.com'), |
| ('chrome-internal', 'git-example.chromium.org'), |
| ('chrome-internal-review', 'git-example.chromium.org'), |
| ('conflict', 'git-example.google.com'), |
| ('conflict-review', 'git-example.chromium.org'), |
| ('dup', 'git-example.google.com'), |
| ('dup', 'git-example.google.com'), |
| ('dup-review', 'git-example.google.com'), |
| ('partial', 'git-example.google.com'), |
| ]) |
| self.assertTrue(self.c.has_generic_host()) |
| self.assertEqual(set(['conflict.googlesource.com']), |
| self.c.get_conflicting_hosts()) |
| self.assertEqual(set(['dup.googlesource.com']), |
| self.c.get_duplicated_hosts()) |
| self.assertEqual(set(['partial.googlesource.com']), |
| self.c.get_partially_configured_hosts()) |
| self.assertEqual(set(['chromium.googlesource.com', |
| 'chrome-internal.googlesource.com']), |
| self.c.get_hosts_with_wrong_identities()) |
| |
| def test_report_no_problems(self): |
| self.test_analysis_nothing() |
| self.mock(sys, 'stdout', StringIO.StringIO()) |
| self.assertFalse(self.c.find_and_report_problems()) |
| self.assertEqual(sys.stdout.getvalue(), '') |
| |
| def test_report(self): |
| self.test_analysis() |
| self.mock(sys, 'stdout', StringIO.StringIO()) |
| self.assertTrue(self.c.find_and_report_problems()) |
| with open(os.path.join(os.path.dirname(__file__), |
| 'git_cl_creds_check_report.txt')) as f: |
| expected = f.read() |
| def by_line(text): |
| return [l.rstrip() for l in text.rstrip().splitlines()] |
| self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected)) |
| |
| class TestGitCl(TestCase): |
| def setUp(self): |
| super(TestGitCl, self).setUp() |
| self.calls = [] |
| self._calls_done = [] |
| self.mock(subprocess2, 'call', self._mocked_call) |
| self.mock(subprocess2, 'check_call', self._mocked_call) |
| self.mock(subprocess2, 'check_output', self._mocked_call) |
| self.mock(subprocess2, 'communicate', |
| lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0)) |
| self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call) |
| self.mock(git_common, 'is_dirty_git_tree', lambda x: False) |
| self.mock(git_common, 'get_or_create_merge_base', |
| lambda *a: ( |
| self._mocked_call(['get_or_create_merge_base']+list(a)))) |
| self.mock(git_cl, 'BranchExists', lambda _: True) |
| self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '') |
| self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call( |
| *(['ask_for_data'] + list(a)), **k)) |
| self.mock(git_cl, 'write_json', lambda path, contents: |
| self._mocked_call('write_json', path, contents)) |
| self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock) |
| self.mock(git_cl.rietveld, 'Rietveld', RietveldMock) |
| self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock) |
| self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock) |
| GitCheckoutMock.reset() |
| self.mock(git_cl.upload, 'RealMain', self.fail) |
| self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock) |
| self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock) |
| self.mock(git_cl.gerrit_util, 'GetChangeDetail', |
| lambda *args, **kwargs: self._mocked_call( |
| 'GetChangeDetail', *args, **kwargs)) |
| self.mock(git_cl.gerrit_util, 'AddReviewers', |
| lambda h, i, reviewers, ccs, notify: self._mocked_call( |
| 'AddReviewers', h, i, reviewers, ccs, notify)) |
| self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce', |
| classmethod(lambda _: False)) |
| self.mock(git_cl, 'DieWithError', |
| lambda msg, change=None: self._mocked_call(['DieWithError', msg])) |
| # It's important to reset settings to not have inter-tests interference. |
| git_cl.settings = None |
| |
| def tearDown(self): |
| try: |
| self.assertEquals([], self.calls) |
| except AssertionError: |
| if not self.has_failed(): |
| raise |
| # Sadly, has_failed() returns True if this OR any other tests before this |
| # one have failed. |
| git_cl.logging.error( |
| '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n' |
| 'There are un-consumed self.calls after this test has finished.\n' |
| 'If you don\'t know which test this is, run:\n' |
| ' tests/git_cl_tests.py -v\n' |
| 'If you are already running only this test, then **first** fix the ' |
| 'problem whose exception is emitted below by unittest runner.\n' |
| 'Else, to be sure what\'s going on, run this test **alone** with \n' |
| ' tests/git_cl_tests.py TestGitCl.<name>\n' |
| 'and follow instructions above.\n' + |
| '=' * 80) |
| finally: |
| super(TestGitCl, self).tearDown() |
| |
| def _mocked_call(self, *args, **_kwargs): |
| self.assertTrue( |
| self.calls, |
| '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args)) |
| top = self.calls.pop(0) |
| expected_args, result = top |
| |
| # Also logs otherwise it could get caught in a try/finally and be hard to |
| # diagnose. |
| if expected_args != args: |
| N = 5 |
| prior_calls = '\n '.join( |
| '@%d: %r' % (len(self._calls_done) - N + i, c[0]) |
| for i, c in enumerate(self._calls_done[-N:])) |
| following_calls = '\n '.join( |
| '@%d: %r' % (len(self._calls_done) + i + 1, c[0]) |
| for i, c in enumerate(self.calls[:N])) |
| extended_msg = ( |
| 'A few prior calls:\n %s\n\n' |
| 'This (expected):\n @%d: %r\n' |
| 'This (actual):\n @%d: %r\n\n' |
| 'A few following expected calls:\n %s' % |
| (prior_calls, len(self._calls_done), expected_args, |
| len(self._calls_done), args, following_calls)) |
| git_cl.logging.error(extended_msg) |
| |
| self.fail('@%d\n' |
| ' Expected: %r\n' |
| ' Actual: %r' % ( |
| len(self._calls_done), expected_args, args)) |
| |
| self._calls_done.append(top) |
| if isinstance(result, Exception): |
| raise result |
| return result |
| |
| def test_ask_for_explicit_yes_true(self): |
| self.calls = [ |
| (('ask_for_data', 'prompt [Yes/No]: '), 'blah'), |
| (('ask_for_data', 'Please, type yes or no: '), 'ye'), |
| ] |
| self.assertTrue(git_cl.ask_for_explicit_yes('prompt')) |
| |
| def test_ask_for_explicit_yes_true(self): |
| self.calls = [ |
| (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'), |
| (('ask_for_data', 'Please, type yes or no: '), 'nO'), |
| ] |
| self.assertFalse(git_cl.ask_for_explicit_yes('prompt')) |
| |
| def test_LoadCodereviewSettingsFromFile_gerrit(self): |
| codereview_file = StringIO.StringIO('GERRIT_HOST: true') |
| self.calls = [ |
| ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],), |
| CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1), |
| ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],), |
| CERR1), |
| ((['git', 'config', 'gerrit.host', 'true'],), ''), |
| ] |
| self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file)) |
| |
| @classmethod |
| def _is_gerrit_calls(cls, gerrit=False): |
| return [((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')] |
| |
| @classmethod |
| def _upload_calls(cls, similarity, find_copies, private): |
| return (cls._rietveld_git_base_calls(similarity, find_copies) + |
| cls._git_upload_calls(private)) |
| |
| @classmethod |
| def _rietveld_upload_no_rev_calls(cls, similarity, find_copies): |
| return (cls._rietveld_git_base_calls(similarity, find_copies) + [ |
| ((['git', 'config', 'core.editor'],), ''), |
| ]) |
| |
| @classmethod |
| def _rietveld_git_base_calls(cls, similarity, find_copies): |
| if similarity is None: |
| similarity = '50' |
| similarity_call = ((['git', 'config', |
| 'branch.master.git-cl-similarity'],), CERR1) |
| else: |
| similarity_call = ((['git', 'config', |
| 'branch.master.git-cl-similarity', similarity],), '') |
| |
| if find_copies is None: |
| find_copies = True |
| find_copies_call = ((['git', 'config', '--bool', |
| 'branch.master.git-find-copies'],), CERR1) |
| else: |
| val = str(find_copies).lower() |
| find_copies_call = ((['git', 'config', '--bool', |
| 'branch.master.git-find-copies', val],), '') |
| |
| if find_copies: |
| stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
| '-l100000', '-C'+similarity, |
| 'fake_ancestor_sha', 'HEAD'],), '+dat') |
| else: |
| stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
| '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat') |
| |
| return [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| similarity_call, |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| find_copies_call, |
| ] + cls._is_gerrit_calls() + [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.master.gerritissue'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), |
| 'codereview.example.com'), |
| ((['git', 'config', 'branch.master.merge'],), 'master'), |
| ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| ((['get_or_create_merge_base', 'master', 'master'],), |
| 'fake_ancestor_sha'), |
| ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
| ((['git', 'rev-parse', '--show-cdup'],), ''), |
| ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| ((['git', 'diff', '--name-status', '--no-renames', '-r', |
| 'fake_ancestor_sha...', '.'],), |
| 'M\t.gitignore\n'), |
| ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1), |
| ((['git', 'log', '--pretty=format:%s%n%n%b', |
| 'fake_ancestor_sha...'],), |
| 'foo'), |
| ((['git', 'config', 'user.email'],), '[email protected]'), |
| stat_call, |
| ((['git', 'log', '--pretty=format:%s\n\n%b', |
| 'fake_ancestor_sha..HEAD'],), |
| 'desc\n'), |
| ((['git', 'config', 'rietveld.bug-prefix'],), ''), |
| ] |
| |
| @classmethod |
| def _git_upload_calls(cls, private): |
| if private: |
| cc_call = [] |
| private_call = [] |
| else: |
| cc_call = [((['git', 'config', 'rietveld.cc'],), '')] |
| private_call = [ |
| ((['git', 'config', 'rietveld.private'],), '')] |
| |
| return [ |
| ((['git', 'config', 'core.editor'],), ''), |
| ] + cc_call + private_call + [ |
| ((['git', 'config', 'branch.master.base-url'],), ''), |
| ((['git', 'config', 'remote.origin.url'],), ''), |
| ((['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, get_remote_branch=True): |
| fake_ancestor = 'fake_ancestor' |
| fake_cl = 'fake_cl_for_patch' |
| return [ |
| ((['git', |
| 'rev-parse', '--verify', diff_base],), fake_ancestor), |
| ((['git', |
| 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor), |
| ((['git', |
| 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl), |
| # Mock a config miss (error code 1) |
| ((['git', |
| 'config', 'gitcl.remotebranch'],), CERR1), |
| ] + ([ |
| # Call to GetRemoteBranch() |
| ((['git', |
| 'config', 'branch.%s.merge' % working_branch],), |
| 'refs/heads/master'), |
| ((['git', |
| 'config', 'branch.%s.remote' % working_branch],), 'origin'), |
| ] if get_remote_branch else []) + [ |
| ((['git', 'rev-list', '^' + fake_ancestor, |
| 'refs/remotes/origin/master'],), ''), |
| ] |
| |
| @staticmethod |
| def _cmd_line(description, args, similarity, find_copies, private, cc): |
| """Returns the upload command line passed to upload.RealMain().""" |
| return [ |
| 'upload', '--assume_yes', '--server', |
| 'https://codereview.example.com', |
| '--message', description |
| ] + args + [ |
| '--cc', ','.join(['[email protected]'] + cc), |
| ] + (['--private'] if private else []) + [ |
| '--git_similarity', similarity or '50' |
| ] + (['--git_no_find_copies'] if find_copies is False else []) + [ |
| 'fake_ancestor_sha', 'HEAD' |
| ] |
| |
| def _run_reviewer_test( |
| self, |
| upload_args, |
| expected_description, |
| returned_description, |
| final_description, |
| reviewers, |
| private=False, |
| cc=None): |
| """Generic reviewer test framework.""" |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| try: |
| similarity = upload_args[upload_args.index('--similarity')+1] |
| except ValueError: |
| similarity = None |
| |
| if '--find-copies' in upload_args: |
| find_copies = True |
| elif '--no-find-copies' in upload_args: |
| find_copies = False |
| else: |
| find_copies = None |
| |
| private = '--private' in upload_args |
| cc = cc or [] |
| |
| self.calls = self._upload_calls(similarity, find_copies, private) |
| |
| def RunEditor(desc, _, **kwargs): |
| self.assertEquals( |
| '# Enter a description of the change.\n' |
| '# This will be displayed on the codereview site.\n' |
| '# The first line will also be used as the subject of the review.\n' |
| '#--------------------This line is 72 characters long' |
| '--------------------\n' + |
| expected_description, |
| desc) |
| return returned_description |
| self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| |
| def check_upload(args): |
| cmd_line = self._cmd_line(final_description, reviewers, similarity, |
| find_copies, private, cc) |
| self.assertEquals(cmd_line, args) |
| return 1, 2 |
| self.mock(git_cl.upload, 'RealMain', check_upload) |
| |
| git_cl.main(['upload'] + upload_args) |
| |
| def test_no_reviewer(self): |
| self._run_reviewer_test( |
| [], |
| 'desc\n\nBUG=', |
| '# Blah blah comment.\ndesc\n\nBUG=', |
| 'desc\n\nBUG=', |
| []) |
| |
| def test_keep_similarity(self): |
| self._run_reviewer_test( |
| ['--similarity', '70'], |
| 'desc\n\nBUG=', |
| '# Blah blah comment.\ndesc\n\nBUG=', |
| 'desc\n\nBUG=', |
| []) |
| |
| def test_keep_find_copies(self): |
| self._run_reviewer_test( |
| ['--no-find-copies'], |
| 'desc\n\nBUG=', |
| '# Blah blah comment.\ndesc\n\nBUG=\n', |
| 'desc\n\nBUG=', |
| []) |
| |
| def test_private(self): |
| self._run_reviewer_test( |
| ['--private'], |
| 'desc\n\nBUG=', |
| '# Blah blah comment.\ndesc\n\nBUG=\n', |
| 'desc\n\nBUG=', |
| []) |
| |
| def test_reviewers_cmd_line(self): |
| # Reviewer is passed as-is |
| description = 'desc\n\[email protected]\nBUG=' |
| self._run_reviewer_test( |
| ['-r' '[email protected]'], |
| description, |
| '\n%s\n' % description, |
| description, |
| ['[email protected]']) |
| |
| def test_reviewer_tbr_overriden(self): |
| # Reviewer is overriden with TBR |
| # Also verifies the regexp work without a trailing LF |
| description = 'Foo Bar\n\[email protected]' |
| self._run_reviewer_test( |
| ['-r' '[email protected]'], |
| 'desc\n\[email protected]\nBUG=', |
| description.strip('\n'), |
| description, |
| ['[email protected]']) |
| |
| def test_reviewer_multiple(self): |
| # Handles multiple R= or TBR= lines. |
| description = ( |
| 'Foo Bar\[email protected]\nBUG=\[email protected]\n' |
| '[email protected],[email protected]') |
| self._run_reviewer_test( |
| [], |
| 'desc\n\nBUG=', |
| description, |
| description, |
| ['[email protected],[email protected]'], |
| cc=['[email protected]', '[email protected]']) |
| |
| def test_reviewer_send_mail(self): |
| # --send-mail can be used without -r if R= is used |
| description = 'Foo Bar\[email protected]' |
| self._run_reviewer_test( |
| ['--send-mail'], |
| 'desc\n\nBUG=', |
| description.strip('\n'), |
| description, |
| ['[email protected]', '--send_mail']) |
| |
| def test_reviewer_send_mail_no_rev(self): |
| # Fails without a reviewer. |
| stdout = StringIO.StringIO() |
| self.calls = self._rietveld_upload_no_rev_calls(None, None) + [ |
| ((['DieWithError', 'Must specify reviewers to send email.'],), |
| SystemExitMock()) |
| ] |
| |
| def RunEditor(desc, _, **kwargs): |
| return desc |
| self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| self.mock(sys, 'stdout', stdout) |
| with self.assertRaises(SystemExitMock): |
| git_cl.main(['upload', '--send-mail']) |
| self.assertEqual( |
| '=====================================\n' |
| 'NOTICE: Rietveld is being deprecated. ' |
| 'You can upload changes to Gerrit with\n' |
| ' git cl upload --gerrit\n' |
| 'or set Gerrit to be your default code review tool with\n' |
| ' git config gerrit.host true\n' |
| '=====================================\n', |
| stdout.getvalue()) |
| |
| def test_bug_on_cmd(self): |
| self._run_reviewer_test( |
| ['--bug=500658,proj:123'], |
| 'desc\n\nBUG=500658\nBUG=proj:123', |
| '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234', |
| 'desc\n\nBUG=500658\nBUG=proj:1234', |
| []) |
| |
| def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False, |
| parent_msg=None, |
| new_msg=None, |
| fail_after_parent_msg=False, |
| fail_cherry_pick=False, |
| fail_push_count=0, |
| debug=False): |
| if debug: |
| # Very useful due to finally clause in git cl land raising exceptions and |
| # shadowing real cause of failure. |
| self.mock(git_cl, '_IS_BEING_TESTED', True) |
| else: |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| |
| if git_numberer_enabled: |
| # Special mocks to check validity of timestamp. |
| original_git_amend_head = git_cl._git_amend_head |
| def _git_amend_head_mock(msg, tstamp): |
| self._mocked_call(['git_amend_head committer timestamp', tstamp]) |
| return original_git_amend_head(msg, tstamp) |
| self.mock(git_cl, '_git_amend_head', _git_amend_head_mock) |
| |
| self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref: |
| self._mocked_call('_is_git_numberer_enabled', url, ref)) |
| self.mock(RietveldMock, 'update_description', staticmethod( |
| lambda i, d: self._mocked_call(['update_description', i, d]))) |
| self.mock(RietveldMock, 'add_comment', staticmethod( |
| lambda i, c: self._mocked_call(['add_comment', i, c]))) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],), |
| CERR1), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'rietveld.server'],), |
| 'https://codereview.chromium.org'), |
| ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'), |
| ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'), |
| ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],), |
| ''), # No commits to rebase, according to local view of origin. |
| ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],), |
| 'fake_ancestor_sha'), |
| ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [ |
| ((['git', 'rev-parse', '--show-cdup'],), ''), |
| ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'), |
| ((['git', 'diff', '--name-status', '--no-renames', '-r', |
| 'fake_ancestor_sha...', '.'],), |
| 'M\tfile1.cpp'), |
| ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), |
| 'https://codereview.chromium.org'), |
| ((['git', 'config', 'user.email'],), '[email protected]'), |
| ((['git', 'config', 'rietveld.tree-status-url'],), CERR1), |
| ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50', |
| 'fake_ancestor_sha', 'feature'],), |
| # This command just prints something like this: |
| # file1.cpp | 53 ++++++-- |
| # 1 file changed, 33 insertions(+), 20 deletions(-)\n |
| ''), |
| ((['git', 'show-ref', '--quiet', '--verify', |
| 'refs/heads/git-cl-commit'],), |
| ''), # 0 return code means branch exists. |
| ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| ((['git', 'show-ref', '--quiet', '--verify', |
| 'refs/heads/git-cl-cherry-pick'],), |
| CERR1), # This means git-cl-cherry-pick branch does not exist. |
| ((['git', 'rev-parse', '--show-cdup'],), ''), |
| ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''), |
| ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''), |
| ((['git', 'commit', '-m', |
| 'Issue: 123\n\[email protected]\n\n' |
| 'Review-Url: https://codereview.chromium.org/123 .'],), ''), |
| ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'), |
| ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| ((['git', 'config', '--get', 'remote.origin.url'],), |
| repo_url), |
| |
| ((['git', 'config', 'remote.origin.url'],), repo_url), |
| (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'), |
| git_numberer_enabled), |
| |
| # Auto-rebase init. |
| ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'), |
| ] |
| # Auto-rebase loops. |
| for attempt in xrange(fail_push_count + 1): |
| self.calls += [ |
| # Auto-rebase loop start. |
| ((['git', 'retry', 'fetch', 'origin', |
| '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''), |
| ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''), |
| # NOTE: if fail_push_count>0, this sha1_of_parent should probably be |
| # different in each loop iteration for truly realistic test. |
| ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'), |
| ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],), |
| callError(1, 'failed to cherry pick') if fail_cherry_pick |
| else ''), |
| ] |
| if fail_cherry_pick: |
| return |
| |
| if git_numberer_enabled: |
| assert parent_msg |
| self.calls += [ |
| ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],), |
| parent_msg), |
| ] |
| if fail_after_parent_msg: |
| return |
| assert new_msg |
| self.calls += [ |
| ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],), |
| '1480022355'), # Committer's unix timestamp. |
| ((['git', 'show', '-s', '--format=%ct', 'HEAD'],), |
| '1480024000'), |
| ((['git_amend_head committer timestamp', 1480024000],), ''), |
| ((['git', 'commit', '--amend', '-m', new_msg],), ''), |
| ] |
| self.calls += [ |
| ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],), |
| CERR1 if attempt < fail_push_count else ''), |
| ] |
| # End of autorebase + push. |
| |
| self.calls += [ |
| ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'), |
| ] |
| if git_numberer_enabled: |
| self.calls += [ |
| ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg), |
| ] |
| |
| # Cleanup calls. |
| self.calls += [ |
| ((['git', 'checkout', '-q', 'feature'],), ''), |
| ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''), |
| ] |
| |
| def test_land_rietveld(self): |
| self._land_rietveld_calls( |
| repo_url='https://chromium.googlesource.com/infra/infra', |
| git_numberer_enabled=False, |
| debug=False) |
| self.calls += [ |
| ((['git', 'config', 'rietveld.viewvc-url'],), |
| 'https://chromium.googlesource.com/infra/infra/+/'), |
| ((['update_description', 123, |
| 'Issue: 123\n\[email protected]\n\nCommitted: ' |
| 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],), |
| ''), |
| ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as ' |
| 'sha1_committed (presubmit successful).'],), ''), |
| ] |
| git_cl.main(['land']) |
| |
| def test_land_rietveld_fail_cherry_pick(self): |
| self._land_rietveld_calls( |
| repo_url='https://chromium.googlesource.com/infra/infra', |
| git_numberer_enabled=False, |
| fail_cherry_pick=True, |
| debug=False) |
| self.calls += [ |
| ((['git', 'diff', '--name-status', '--diff-filter=U'],), |
| 'U path/file1\n' |
| 'U file2.cpp\n'), |
| ((['git', 'cherry-pick', '--abort'],), ''), |
| ((['git', 'checkout', '-q', 'feature'],), ''), |
| ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''), |
| ] |
| git_cl.main(['land']) |
| |
| def test_land_rietveld_git_numberer_fail_1_push(self): |
| return self.test_land_rietveld_git_numberer(fail_push_count=1) |
| |
| def test_land_rietveld_git_numberer(self, fail_push_count=0): |
| self._land_rietveld_calls( |
| repo_url='https://chromium.googlesource.com/chromium/src', |
| git_numberer_enabled=True, |
| parent_msg=('This is parent commit.\n' |
| '\n' |
| 'Cr-Commit-Position: refs/heads/master@{#543}\n' |
| 'Cr-Branched-From: refs/svn/2014@{#2208}'), |
| new_msg=('Issue: 123\n\[email protected]\n' |
| '\n' |
| 'Review-Url: https://codereview.chromium.org/123 .\n' |
| 'Cr-Commit-Position: refs/heads/master@{#544}\n' |
| 'Cr-Branched-From: refs/svn/2014@{#2208}'), |
| fail_push_count=fail_push_count, |
| debug=False) |
| |
| self.calls += [ |
| ((['git', 'config', 'rietveld.viewvc-url'],), |
| 'https://chromium.googlesource.com/chromium/src/+/'), |
| ((['update_description', 123, |
| 'Issue: 123\n\[email protected]\n' |
| '\n' |
| 'Review-Url: https://codereview.chromium.org/123 .\n' |
| 'Cr-Commit-Position: refs/heads/master@{#544}\n' |
| 'Cr-Branched-From: refs/svn/2014@{#2208}\n' |
| 'Committed: ' |
| 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],), |
| ''), |
| ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as ' |
| 'sha1_committed (presubmit successful).'],), ''), |
| ] |
| git_cl.main(['land']) |
| |
| def test_land_rietveld_git_numberer_bad_parent(self): |
| self._land_rietveld_calls( |
| repo_url='https://chromium.googlesource.com/v8/v8', |
| git_numberer_enabled=True, |
| parent_msg='This is parent commit with no footer.', |
| fail_after_parent_msg=True, |
| debug=False) |
| self.calls += [ |
| # Cleanup calls to restore original state. |
| ((['git', 'checkout', '-q', 'feature'],), ''), |
| ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''), |
| ] |
| with self.assertRaises(ValueError) as cm: |
| git_cl.main(['land']) |
| self.assertEqual(cm.exception.message, |
| 'Unable to infer commit position from footers') |
| |
| def test_git_numberer_not_whitelisted_repo(self): |
| self.calls = [] |
| res = git_cl._is_git_numberer_enabled( |
| remote_url='https://chromium.googlesource.com/chromium/tools/build', |
| remote_ref='refs/whatever') |
| self.assertEqual(res, False) |
| |
| def test_git_numberer_fail_fetch(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.calls = [ |
| ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src', |
| '+refs/meta/config:refs/git_cl/meta/config'],), CERR1), |
| ] |
| res = git_cl._is_git_numberer_enabled( |
| remote_url='https://chromium.googlesource.com/chromium/src', |
| remote_ref='refs/whatever') |
| self.assertEqual(res, False) |
| |
| def test_git_numberer_valid_configs(self): |
| with git_cl.gclient_utils.temporary_directory() as tempdir: |
| @contextlib.contextmanager |
| def fake_temporary_directory(**kwargs): |
| yield tempdir |
| self.mock(git_cl.gclient_utils, 'temporary_directory', |
| fake_temporary_directory) |
| self._test_GitNumbererState_valid_configs_inner(tempdir) |
| |
| def _test_GitNumbererState_valid_configs_inner(self, tempdir): |
| self.calls = [ |
| ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src', |
| '+refs/meta/config:refs/git_cl/meta/config'],), ''), |
| ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), |
| ''' |
| [plugin "git-numberer"] |
| validate-enabled-refglob = refs/else/* |
| validate-enabled-refglob = refs/heads/* |
| validate-disabled-refglob = refs/heads/disabled |
| validate-disabled-refglob = refs/branch-heads/* |
| '''), |
| ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') , |
| '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],), |
| 'refs/else/*\n' |
| 'refs/heads/*\n'), |
| ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') , |
| '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],), |
| 'refs/heads/disabled\n' |
| 'refs/branch-heads/*\n'), |
| ] * 3 # 3 tests below have exactly the same IO. |
| |
| res = git_cl._is_git_numberer_enabled( |
| remote_url='https://chromium.googlesource.com/chromium/src', |
| remote_ref='refs/heads/test') |
| self.assertEqual(res, True) |
| |
| res = git_cl._is_git_numberer_enabled( |
| remote_url='https://chromium.googlesource.com/chromium/src', |
| remote_ref='refs/heads/disabled') |
| self.assertEqual(res, False) |
| |
| # Validator is disabled by default, even if it's not explicitly in disabled |
| # refglobs. |
| res = git_cl._is_git_numberer_enabled( |
| remote_url='https://chromium.googlesource.com/chromium/src', |
| remote_ref='refs/arbitrary/ref') |
| self.assertEqual(res, False) |
| |
| @classmethod |
| def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False): |
| cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated'] |
| if skip_auth_check: |
| return [((cmd, ), 'true')] |
| |
| calls = [((cmd, ), CERR1)] |
| if issue: |
| calls.extend([ |
| ((['git', 'config', 'branch.master.gerritserver'],), CERR1), |
| ]) |
| calls.extend([ |
| ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
| ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://chromium.googlesource.com/my/repo'), |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://chromium.googlesource.com/my/repo'), |
| ]) |
| return calls |
| |
| @classmethod |
| def _gerrit_base_calls(cls, issue=None, fetched_description=None, |
| fetched_status=None, other_cl_owner=None, |
| custom_cl_base=None): |
| calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1), |
| ] |
| calls += cls._is_gerrit_calls(True) |
| calls += [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.master.gerritissue'],), |
| CERR1 if issue is None else str(issue)), |
| ] |
| |
| if custom_cl_base: |
| ancestor_revision = custom_cl_base |
| else: |
| # Determine ancestor_revision to be merge base. |
| ancestor_revision = 'fake_ancestor_sha' |
| calls += [ |
| ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
| ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| ((['get_or_create_merge_base', 'master', |
| 'refs/remotes/origin/master'],), ancestor_revision), |
| ] |
| |
| # Calls to verify branch point is ancestor |
| calls += cls._gerrit_ensure_auth_calls(issue=issue) |
| |
| if issue: |
| calls += [ |
| (('GetChangeDetail', 'chromium-review.googlesource.com', |
| '123456', |
| ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']), |
| { |
| 'owner': {'email': (other_cl_owner or '[email protected]')}, |
| 'change_id': '123456789', |
| 'current_revision': 'sha1_of_current_revision', |
| 'revisions': { 'sha1_of_current_revision': { |
| 'commit': {'message': fetched_description}, |
| }}, |
| 'status': fetched_status or 'NEW', |
| }), |
| ] |
| if fetched_status == 'ABANDONED': |
| calls += [ |
| (('DieWithError', 'Change https://chromium-review.googlesource.com/' |
| '123456 has been abandoned, new uploads are not ' |
| 'allowed'), SystemExitMock()), |
| ] |
| return calls |
| if other_cl_owner: |
| calls += [ |
| (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''), |
| ] |
| |
| calls += cls._git_sanity_checks(ancestor_revision, 'master', |
| get_remote_branch=False) |
| calls += [ |
| ((['git', 'rev-parse', '--show-cdup'],), ''), |
| ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| |
| ((['git', 'diff', '--name-status', '--no-renames', '-r', |
| ancestor_revision + '...', '.'],), |
| 'M\t.gitignore\n'), |
| ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1), |
| ] |
| |
| if not issue: |
| calls += [ |
| ((['git', 'log', '--pretty=format:%s%n%n%b', |
| ancestor_revision + '...'],), |
| 'foo'), |
| ] |
| |
| calls += [ |
| ((['git', 'config', 'user.email'],), '[email protected]'), |
| ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + |
| ([custom_cl_base] if custom_cl_base else |
| [ancestor_revision, 'HEAD']),), |
| '+dat'), |
| ] |
| return calls |
| |
| @classmethod |
| def _gerrit_upload_calls(cls, description, reviewers, squash, |
| squash_mode='default', |
| expected_upstream_ref='origin/refs/heads/master', |
| ref_suffix='', title=None, notify=False, |
| post_amend_description=None, issue=None, cc=None, |
| git_mirror=None, |
| custom_cl_base=None): |
| if post_amend_description is None: |
| post_amend_description = description |
| cc = cc or [] |
| # Determined in `_gerrit_base_calls`. |
| determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha' |
| |
| calls = [] |
| |
| if squash_mode == 'default': |
| calls.extend([ |
| ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''), |
| ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''), |
| ]) |
| elif squash_mode in ('override_squash', 'override_nosquash'): |
| calls.extend([ |
| ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), |
| 'true' if squash_mode == 'override_squash' else 'false'), |
| ]) |
| else: |
| assert squash_mode in ('squash', 'nosquash') |
| |
| # If issue is given, then description is fetched from Gerrit instead. |
| if issue is None: |
| calls += [ |
| ((['git', 'log', '--pretty=format:%s\n\n%b', |
| ((custom_cl_base + '..') if custom_cl_base else |
| 'fake_ancestor_sha..HEAD')],), |
| description), |
| ] |
| if squash: |
| title = 'Initial_upload' |
| else: |
| if not title: |
| calls += [ |
| ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''), |
| (('ask_for_data', 'Title for patchset []: '), 'User input'), |
| ] |
| title = 'User_input' |
| if not git_footers.get_footer_change_id(description) and not squash: |
| calls += [ |
| (('DownloadGerritHook', False), ''), |
| # Amending of commit message to get the Change-Id. |
| ((['git', 'log', '--pretty=format:%s\n\n%b', |
| determined_ancestor_revision + '..HEAD'],), |
| description), |
| ((['git', 'commit', '--amend', '-m', description],), ''), |
| ((['git', 'log', '--pretty=format:%s\n\n%b', |
| determined_ancestor_revision + '..HEAD'],), |
| post_amend_description) |
| ] |
| if squash: |
| if not issue: |
| # Prompting to edit description on first upload. |
| calls += [ |
| ((['git', 'config', 'core.editor'],), ''), |
| ((['RunEditor'],), description), |
| ] |
| ref_to_push = 'abcdef0123456789' |
| calls += [ |
| ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
| ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| ] |
| |
| if custom_cl_base is None: |
| calls += [ |
| ((['get_or_create_merge_base', 'master', |
| 'refs/remotes/origin/master'],), |
| 'origin/master'), |
| ] |
| parent = 'origin/master' |
| else: |
| calls += [ |
| ((['git', 'merge-base', '--is-ancestor', custom_cl_base, |
| 'refs/remotes/origin/master'],), |
| callError(1)), # Means not ancenstor. |
| (('ask_for_data', |
| 'Do you take responsibility for cleaning up potential mess ' |
| 'resulting from proceeding with upload? Press Enter to upload, ' |
| 'or Ctrl+C to abort'), ''), |
| ] |
| parent = custom_cl_base |
| |
| calls += [ |
| ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash. |
| '0123456789abcdef'), |
| ((['git', 'commit-tree', '0123456789abcdef', '-p', parent, |
| '-m', description],), |
| ref_to_push), |
| ] |
| else: |
| ref_to_push = 'HEAD' |
| |
| calls += [ |
| ((['git', 'rev-list', |
| (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' + |
| ref_to_push],), |
| '1hashPerLine\n'), |
| ] |
| |
| if title: |
| if ref_suffix: |
| ref_suffix += ',m=' + title |
| else: |
| ref_suffix = '%m=' + title |
| |
| notify_suffix = 'notify=NONE' |
| if ref_suffix: |
| ref_suffix += ',' + notify_suffix |
| else: |
| ref_suffix = '%' + notify_suffix |
| |
| if git_mirror is None: |
| calls += [ |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://chromium.googlesource.com/yyy/zzz'), |
| ] |
| else: |
| calls += [ |
| ((['git', 'config', 'remote.origin.url'],), |
| '/cache/this-dir-exists'), |
| (('os.path.isdir', '/cache/this-dir-exists'), |
| True), |
| # Runs in /cache/this-dir-exists. |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://chromium.googlesource.com/yyy/zzz'), |
| ] |
| |
| calls += [ |
| ((['git', 'push', |
| 'https://chromium.googlesource.com/yyy/zzz', |
| ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],), |
| ('remote:\n' |
| 'remote: Processing changes: (\)\n' |
| 'remote: Processing changes: (|)\n' |
| 'remote: Processing changes: (/)\n' |
| 'remote: Processing changes: (-)\n' |
| 'remote: Processing changes: new: 1 (/)\n' |
| 'remote: Processing changes: new: 1, done\n' |
| 'remote:\n' |
| 'remote: New Changes:\n' |
| 'remote: https://chromium-review.googlesource.com/123456 XXX.\n' |
| 'remote:\n' |
| 'To https://chromium.googlesource.com/yyy/zzz\n' |
| ' * [new branch] hhhh -> refs/for/refs/heads/master\n')), |
| ] |
| if squash: |
| calls += [ |
| ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| ''), |
| ((['git', 'config', 'branch.master.gerritserver', |
| 'https://chromium-review.googlesource.com'],), ''), |
| ((['git', 'config', 'branch.master.gerritsquashhash', |
| 'abcdef0123456789'],), ''), |
| ] |
| calls += [ |
| ((['git', 'config', 'rietveld.cc'],), ''), |
| (('AddReviewers', 'chromium-review.googlesource.com', |
| 123456 if squash else None, sorted(reviewers), |
| ['[email protected]'] + cc, notify), ''), |
| ] |
| calls += cls._git_post_upload_calls() |
| return calls |
| |
| def _run_gerrit_upload_test( |
| self, |
| upload_args, |
| description, |
| reviewers=None, |
| squash=True, |
| squash_mode=None, |
| expected_upstream_ref='origin/refs/heads/master', |
| ref_suffix='', |
| title=None, |
| notify=False, |
| post_amend_description=None, |
| issue=None, |
| cc=None, |
| git_mirror=None, |
| fetched_status=None, |
| other_cl_owner=None, |
| custom_cl_base=None): |
| """Generic gerrit upload test framework.""" |
| if squash_mode is None: |
| if '--no-squash' in upload_args: |
| squash_mode = 'nosquash' |
| elif '--squash' in upload_args: |
| squash_mode = 'squash' |
| else: |
| squash_mode = 'default' |
| |
| reviewers = reviewers or [] |
| cc = cc or [] |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
| CookiesAuthenticatorMockFactory( |
| same_auth=('git-owner.example.com', '', 'pass'))) |
| self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck', |
| lambda _, offer_removal: None) |
| self.mock(git_cl.gclient_utils, 'RunEditor', |
| lambda *_, **__: self._mocked_call(['RunEditor'])) |
| self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call( |
| 'DownloadGerritHook', force)) |
| |
| original_os_path_isdir = os.path.isdir |
| def selective_os_path_isdir_mock(path): |
| if path == '/cache/this-dir-exists': |
| return self._mocked_call('os.path.isdir', path) |
| return original_os_path_isdir(path) |
| self.mock(os.path, 'isdir', selective_os_path_isdir_mock) |
| |
| self.calls = self._gerrit_base_calls( |
| issue=issue, |
| fetched_description=description, |
| fetched_status=fetched_status, |
| other_cl_owner=other_cl_owner, |
| custom_cl_base=custom_cl_base) |
| if fetched_status != 'ABANDONED': |
| self.calls += self._gerrit_upload_calls( |
| description, reviewers, squash, |
| squash_mode=squash_mode, |
| expected_upstream_ref=expected_upstream_ref, |
| ref_suffix=ref_suffix, title=title, notify=notify, |
| post_amend_description=post_amend_description, |
| issue=issue, cc=cc, git_mirror=git_mirror, |
| custom_cl_base=custom_cl_base) |
| # Uncomment when debugging. |
| # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))) |
| git_cl.main(['upload'] + upload_args) |
| |
| def test_gerrit_upload_without_change_id(self): |
| self._run_gerrit_upload_test( |
| ['--no-squash'], |
| 'desc\n\nBUG=\n', |
| [], |
| squash=False, |
| post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx') |
| |
| def test_gerrit_upload_without_change_id_override_nosquash(self): |
| self._run_gerrit_upload_test( |
| [], |
| 'desc\n\nBUG=\n', |
| [], |
| squash=False, |
| squash_mode='override_nosquash', |
| post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx') |
| |
| def test_gerrit_no_reviewer(self): |
| self._run_gerrit_upload_test( |
| [], |
| 'desc\n\nBUG=\n\nChange-Id: I123456789\n', |
| [], |
| squash=False, |
| squash_mode='override_nosquash') |
| |
| def test_gerrit_patchset_title_bad_chars(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self._run_gerrit_upload_test( |
| ['-f', '-t', 'Don\'t put bad cha,.rs'], |
| 'desc\n\nBUG=\n\nChange-Id: I123456789', |
| squash=False, |
| squash_mode='override_nosquash', |
| title='Dont_put_bad_chars') |
| self.assertIn( |
| 'WARNING: Patchset title may only contain alphanumeric chars ' |
| 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n' |
| 'Cleaned up title: Dont put bad chars\n', |
| git_cl.sys.stdout.getvalue()) |
| |
| def test_gerrit_reviewers_cmd_line(self): |
| self._run_gerrit_upload_test( |
| ['-r', '[email protected]', '--send-mail'], |
| 'desc\n\nBUG=\n\nChange-Id: I123456789', |
| ['[email protected]'], |
| squash=False, |
| squash_mode='override_nosquash', |
| notify=True) |
| |
| def test_gerrit_reviewer_multiple(self): |
| self._run_gerrit_upload_test( |
| [], |
| 'desc\[email protected]\nBUG=\[email protected]\n' |
| '[email protected],[email protected]\n\n' |
| 'Change-Id: 123456789\n', |
| ['[email protected]', '[email protected]'], |
| squash=False, |
| squash_mode='override_nosquash', |
| ref_suffix='%l=Code-Review+1', |
| cc=['[email protected]', '[email protected]']) |
| |
| def test_gerrit_upload_squash_first_is_default(self): |
| self._run_gerrit_upload_test( |
| [], |
| 'desc\nBUG=\n\nChange-Id: 123456789', |
| [], |
| expected_upstream_ref='origin/master') |
| |
| def test_gerrit_upload_squash_first(self): |
| self._run_gerrit_upload_test( |
| ['--squash'], |
| 'desc\nBUG=\n\nChange-Id: 123456789', |
| [], |
| squash=True, |
| expected_upstream_ref='origin/master') |
| |
| def test_gerrit_upload_squash_first_against_rev(self): |
| custom_cl_base = 'custom_cl_base_rev_or_branch' |
| self._run_gerrit_upload_test( |
| ['--squash', custom_cl_base], |
| 'desc\nBUG=\n\nChange-Id: 123456789', |
| [], |
| squash=True, |
| expected_upstream_ref='origin/master', |
| custom_cl_base=custom_cl_base) |
| self.assertIn( |
| 'If you proceed with upload, more than 1 CL may be created by Gerrit', |
| sys.stdout.getvalue()) |
| |
| def test_gerrit_upload_squash_first_with_mirror(self): |
| self._run_gerrit_upload_test( |
| ['--squash'], |
| 'desc\nBUG=\n\nChange-Id: 123456789', |
| [], |
| squash=True, |
| expected_upstream_ref='origin/master', |
| git_mirror='https://chromium.googlesource.com/yyy/zzz') |
| |
| def test_gerrit_upload_squash_reupload(self): |
| description = 'desc\nBUG=\n\nChange-Id: 123456789' |
| self._run_gerrit_upload_test( |
| ['--squash'], |
| description, |
| [], |
| squash=True, |
| expected_upstream_ref='origin/master', |
| issue=123456) |
| |
| def test_gerrit_upload_squash_reupload_to_abandoned(self): |
| self.mock(git_cl, 'DieWithError', |
| lambda msg, change=None: self._mocked_call('DieWithError', msg)) |
| description = 'desc\nBUG=\n\nChange-Id: 123456789' |
| with self.assertRaises(SystemExitMock): |
| self._run_gerrit_upload_test( |
| ['--squash'], |
| description, |
| [], |
| squash=True, |
| expected_upstream_ref='origin/master', |
| issue=123456, |
| fetched_status='ABANDONED') |
| |
| def test_gerrit_upload_squash_reupload_to_not_owned(self): |
| self.mock(git_cl.gerrit_util, 'GetAccountDetails', |
| lambda *_, **__: {'email': '[email protected]'}) |
| description = 'desc\nBUG=\n\nChange-Id: 123456789' |
| self._run_gerrit_upload_test( |
| ['--squash'], |
| description, |
| [], |
| squash=True, |
| expected_upstream_ref='origin/master', |
| issue=123456, |
| other_cl_owner='[email protected]') |
| self.assertIn( |
| 'WARNING: Change 123456 is owned by [email protected], but you ' |
| 'authenticate to Gerrit as [email protected].\n' |
| 'Uploading may fail due to lack of permissions', |
| git_cl.sys.stdout.getvalue()) |
| |
| def test_upload_branch_deps(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| def mock_run_git(*args, **_kwargs): |
| if args[0] == ['for-each-ref', |
| '--format=%(refname:short) %(upstream:short)', |
| 'refs/heads']: |
| # Create a local branch dependency tree that looks like this: |
| # test1 -> test2 -> test3 -> test4 -> test5 |
| # -> test3.1 |
| # test6 -> test0 |
| branch_deps = [ |
| 'test2 test1', # test1 -> test2 |
| 'test3 test2', # test2 -> test3 |
| 'test3.1 test2', # test2 -> test3.1 |
| 'test4 test3', # test3 -> test4 |
| 'test5 test4', # test4 -> test5 |
| 'test6 test0', # test0 -> test6 |
| 'test7', # test7 |
| ] |
| return '\n'.join(branch_deps) |
| self.mock(git_cl, 'RunGit', mock_run_git) |
| |
| class RecordCalls: |
| times_called = 0 |
| record_calls = RecordCalls() |
| def mock_CMDupload(*args, **_kwargs): |
| record_calls.times_called += 1 |
| return 0 |
| self.mock(git_cl, 'CMDupload', mock_CMDupload) |
| |
| self.calls = [ |
| (('ask_for_data', 'This command will checkout all dependent branches ' |
| 'and run "git cl upload". Press Enter to continue, ' |
| 'or Ctrl+C to abort'), ''), |
| ] |
| |
| class MockChangelist(): |
| def __init__(self): |
| pass |
| def GetBranch(self): |
| return 'test1' |
| def GetIssue(self): |
| 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. |
| self.assertEquals(5, record_calls.times_called) |
| self.assertEquals(0, ret) |
| |
| def test_gerrit_change_id(self): |
| self.calls = [ |
| ((['git', 'write-tree'], ), |
| 'hashtree'), |
| ((['git', 'rev-parse', 'HEAD~0'], ), |
| 'branch-parent'), |
| ((['git', 'var', 'GIT_AUTHOR_IDENT'], ), |
| 'A B <[email protected]> 1456848326 +0100'), |
| ((['git', 'var', 'GIT_COMMITTER_IDENT'], ), |
| 'C D <[email protected]> 1456858326 +0100'), |
| ((['git', 'hash-object', '-t', 'commit', '--stdin'], ), |
| 'hashchange'), |
| ] |
| change_id = git_cl.GenerateGerritChangeId('line1\nline2\n') |
| self.assertEqual(change_id, 'Ihashchange') |
| |
| def test_desecription_append_footer(self): |
| for init_desc, footer_line, expected_desc in [ |
| # Use unique desc first lines for easy test failure identification. |
| ('foo', 'R=one', 'foo\n\nR=one'), |
| ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='), |
| ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two', |
| 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'), |
| ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz', |
| 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'), |
| ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz', |
| 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'), |
| ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'), |
| ]: |
| desc = git_cl.ChangeDescription(init_desc) |
| desc.append_footer(footer_line) |
| self.assertEqual(desc.description, expected_desc) |
| |
| def test_update_reviewers(self): |
| data = [ |
| ('foo', [], [], |
| 'foo'), |
| ('foo\nR=xx', [], [], |
| 'foo\nR=xx'), |
| ('foo\nTBR=xx', [], [], |
| 'foo\nTBR=xx'), |
| ('foo', ['a@c'], [], |
| 'foo\n\nR=a@c'), |
| ('foo\nR=xx', ['a@c'], [], |
| 'foo\n\nR=a@c, xx'), |
| ('foo\nTBR=xx', ['a@c'], [], |
| 'foo\n\nR=a@c\nTBR=xx'), |
| ('foo\nTBR=xx\nR=yy', ['a@c'], [], |
| 'foo\n\nR=a@c, yy\nTBR=xx'), |
| ('foo\nBUG=', ['a@c'], [], |
| 'foo\nBUG=\nR=a@c'), |
| ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [], |
| 'foo\n\nR=a@c, bar, xx\nTBR=yy'), |
| ('foo', ['a@c', 'b@c'], [], |
| 'foo\n\nR=a@c, b@c'), |
| ('foo\nBar\n\nR=\nBUG=', ['c@c'], [], |
| 'foo\nBar\n\nR=c@c\nBUG='), |
| ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [], |
| 'foo\nBar\n\nR=c@c\nBUG='), |
| # Same as the line before, but full of whitespaces. |
| ( |
| 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [], |
| 'foo\nBar\n\nR=c@c\n BUG =', |
| ), |
| # Whitespaces aren't interpreted as new lines. |
| ('foo BUG=allo R=joe ', ['c@c'], [], |
| 'foo BUG=allo R=joe\n\nR=c@c'), |
| # Redundant TBRs get promoted to Rs |
| ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'], |
| 'foo\n\nR=a@c, b@c\nTBR=t@c'), |
| ] |
| expected = [i[-1] for i in data] |
| actual = [] |
| for orig, reviewers, tbrs, _expected in data: |
| obj = git_cl.ChangeDescription(orig) |
| obj.update_reviewers(reviewers, tbrs) |
| actual.append(obj.description) |
| self.assertEqual(expected, actual) |
| |
| def test_get_target_ref(self): |
| # Check remote or remote branch not present. |
| self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master')) |
| self.assertEqual(None, git_cl.GetTargetRef(None, |
| 'refs/remotes/origin/master', |
| 'master')) |
| |
| # Check default target refs for branches. |
| self.assertEqual('refs/heads/master', |
| git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
| None)) |
| self.assertEqual('refs/heads/master', |
| git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr', |
| None)) |
| self.assertEqual('refs/heads/master', |
| git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr', |
| None)) |
| self.assertEqual('refs/branch-heads/123', |
| git_cl.GetTargetRef('origin', |
| 'refs/remotes/branch-heads/123', |
| None)) |
| self.assertEqual('refs/diff/test', |
| git_cl.GetTargetRef('origin', |
| 'refs/remotes/origin/refs/diff/test', |
| None)) |
| self.assertEqual('refs/heads/chrome/m42', |
| git_cl.GetTargetRef('origin', |
| 'refs/remotes/origin/chrome/m42', |
| None)) |
| |
| # Check target refs for user-specified target branch. |
| for branch in ('branch-heads/123', 'remotes/branch-heads/123', |
| 'refs/remotes/branch-heads/123'): |
| self.assertEqual('refs/branch-heads/123', |
| git_cl.GetTargetRef('origin', |
| 'refs/remotes/origin/master', |
| branch)) |
| for branch in ('origin/master', 'remotes/origin/master', |
| 'refs/remotes/origin/master'): |
| self.assertEqual('refs/heads/master', |
| git_cl.GetTargetRef('origin', |
| 'refs/remotes/branch-heads/123', |
| branch)) |
| for branch in ('master', 'heads/master', 'refs/heads/master'): |
| self.assertEqual('refs/heads/master', |
| git_cl.GetTargetRef('origin', |
| 'refs/remotes/branch-heads/123', |
| branch)) |
| |
| def test_patch_when_dirty(self): |
| # Patch when local tree is dirty |
| self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
| |
| def test_diff_when_dirty(self): |
| # Do 'git cl diff' when local tree is dirty |
| self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| self.assertNotEqual(git_cl.main(['diff']), 0) |
| |
| @staticmethod |
| def _get_gerrit_codereview_server_calls(branch, value=None, |
| git_short_host='host', |
| detect_branch=True): |
| """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer. |
| |
| If value is given, branch.<BRANCH>.gerritcodereview is already set. |
| """ |
| calls = [] |
| if detect_branch: |
| calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch)) |
| calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],), |
| CERR1 if value is None else value)) |
| if value is None: |
| calls += [ |
| ((['git', 'config', 'branch.' + branch + '.merge'],), |
| 'refs/heads' + branch), |
| ((['git', 'config', 'branch.' + branch + '.remote'],), |
| 'origin'), |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://%s.googlesource.com/my/repo' % git_short_host), |
| ] |
| return calls |
| |
| def _patch_common(self, default_codereview=None, force_codereview=False, |
| new_branch=False, git_short_host='host', |
| detect_gerrit_server=True, |
| actual_codereview=None): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset', |
| lambda x: '60001') |
| self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription', |
| lambda *a, **kw: 'Description') |
| self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True) |
| |
| if new_branch: |
| self.calls = [((['git', 'new-branch', 'master'],), ''),] |
| else: |
| self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')] |
| |
| if default_codereview: |
| if not force_codereview: |
| # These calls detect codereview to use. |
| self.calls += [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.master.gerritissue'],), CERR1), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ] |
| if default_codereview == 'gerrit': |
| if not force_codereview: |
| self.calls += [ |
| ((['git', 'config', 'gerrit.host'],), 'true'), |
| ] |
| if detect_gerrit_server: |
| self.calls += self._get_gerrit_codereview_server_calls( |
| 'master', git_short_host=git_short_host, |
| detect_branch=not new_branch and force_codereview) |
| actual_codereview = 'gerrit' |
| |
| elif default_codereview == 'rietveld': |
| self.calls += [ |
| ((['git', 'config', 'gerrit.host'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'config', 'branch.master.rietveldserver',],), CERR1), |
| ] |
| actual_codereview = 'rietveld' |
| |
| if actual_codereview == 'rietveld': |
| self.calls += [ |
| ((['git', 'rev-parse', '--show-cdup'],), ''), |
| ] |
| if not default_codereview: |
| self.calls += [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ] |
| elif actual_codereview == 'gerrit': |
| self.calls += [ |
| (('GetChangeDetail', git_short_host + '-review.googlesource.com', |
| '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']), |
| { |
| 'current_revision': '7777777777', |
| 'revisions': { |
| '1111111111': { |
| '_number': 1, |
| 'fetch': {'http': { |
| 'url': 'https://%s.googlesource.com/my/repo' % git_short_host, |
| 'ref': 'refs/changes/56/123456/1', |
| }}, |
| }, |
| '7777777777': { |
| '_number': 7, |
| 'fetch': {'http': { |
| 'url': 'https://%s.googlesource.com/my/repo' % git_short_host, |
| 'ref': 'refs/changes/56/123456/7', |
| }}, |
| }, |
| }, |
| }), |
| ] |
| |
| def _common_patch_rietveld_successful(self, **kwargs): |
| self._patch_common(**kwargs) |
| self.calls += [ |
| ((['git', 'config', 'branch.master.rietveldissue', '123456'],), |
| ''), |
| ((['git', 'config', 'branch.master.rietveldserver', |
| 'https://codereview.example.com'],), ''), |
| ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],), |
| ''), |
| ((['git', 'commit', '-m', |
| 'Description\n\n' + |
| 'patch from issue 123456 at patchset 60001 ' + |
| '(http://crrev.com/123456#ps60001)'],), ''), |
| ] |
| |
| def test_patch_rietveld_default(self): |
| self._common_patch_rietveld_successful(default_codereview='rietveld') |
| self.assertEqual(git_cl.main(['patch', '123456']), 0) |
| |
| def test_patch_rietveld_successful_new_branch(self): |
| self._common_patch_rietveld_successful(default_codereview='rietveld', |
| new_branch=True) |
| self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0) |
| |
| def test_patch_rietveld_guess_by_url(self): |
| self._common_patch_rietveld_successful( |
| default_codereview=None, # It doesn't matter. |
| actual_codereview='rietveld') |
| self.assertEqual(git_cl.main( |
| ['patch', 'https://codereview.example.com/123456']), 0) |
| |
| def test_patch_rietveld_conflict(self): |
| self._patch_common(default_codereview='rietveld') |
| GitCheckoutMock.conflict = True |
| self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
| |
| def test_patch_gerrit_default(self): |
| self._patch_common(default_codereview='gerrit', git_short_host='chromium', |
| detect_gerrit_server=True) |
| self.calls += [ |
| ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 'refs/changes/56/123456/7'],), ''), |
| ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| ''), |
| ((['git', 'config', 'branch.master.gerritserver', |
| 'https://chromium-review.googlesource.com'],), ''), |
| ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''), |
| ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
| ] |
| self.assertEqual(git_cl.main(['patch', '123456']), 0) |
| |
| def test_patch_gerrit_force(self): |
| self._patch_common(default_codereview='gerrit', force_codereview=True, |
| git_short_host='host', detect_gerrit_server=True) |
| self.calls += [ |
| ((['git', 'fetch', 'https://host.googlesource.com/my/repo', |
| 'refs/changes/56/123456/7'],), ''), |
| ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| ''), |
| ((['git', 'config', 'branch.master.gerritserver', |
| 'https://host-review.googlesource.com'],), ''), |
| ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''), |
| ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
| ] |
| self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0) |
| |
| def test_patch_gerrit_guess_by_url(self): |
| self._patch_common( |
| default_codereview=None, # It doesn't matter what's default. |
| actual_codereview='gerrit', |
| git_short_host='else', detect_gerrit_server=False) |
| self.calls += [ |
| ((['git', 'fetch', 'https://else.googlesource.com/my/repo', |
| 'refs/changes/56/123456/1'],), ''), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| ''), |
| ((['git', 'config', 'branch.master.gerritserver', |
| 'https://else-review.googlesource.com'],), ''), |
| ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''), |
| ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
| ] |
| self.assertEqual(git_cl.main( |
| ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0) |
| |
| def test_patch_gerrit_guess_by_url_like_rietveld(self): |
| self._patch_common( |
| default_codereview=None, # It doesn't matter what's default. |
| actual_codereview='gerrit', |
| git_short_host='else', detect_gerrit_server=False) |
| self.calls += [ |
| ((['git', 'fetch', 'https://else.googlesource.com/my/repo', |
| 'refs/changes/56/123456/1'],), ''), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| ''), |
| ((['git', 'config', 'branch.master.gerritserver', |
| 'https://else-review.googlesource.com'],), ''), |
| ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''), |
| ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
| ] |
| self.assertEqual(git_cl.main( |
| ['patch', 'https://else-review.googlesource.com/123456/1']), 0) |
| |
| def test_patch_gerrit_conflict(self): |
| self._patch_common(default_codereview='gerrit', detect_gerrit_server=True, |
| git_short_host='chromium') |
| self.calls += [ |
| ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 'refs/changes/56/123456/7'],), ''), |
| ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| ''), |
| ((['git', 'config', 'branch.master.gerritserver', |
| 'https://chromium-review.googlesource.com'],), ''), |
| ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''), |
| ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1), |
| ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],), |
| SystemExitMock()), |
| ] |
| with self.assertRaises(SystemExitMock): |
| git_cl.main(['patch', '123456']) |
| |
| def test_patch_gerrit_not_exists(self): |
| def notExists(_issue, *_, **kwargs): |
| raise git_cl.gerrit_util.GerritError(404, '') |
| self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists) |
| |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.master.gerritissue'],), CERR1), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'gerrit.host'],), 'true'), |
| ((['git', 'config', 'branch.master.gerritserver'],), CERR1), |
| ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
| ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://chromium.googlesource.com/my/repo'), |
| ((['DieWithError', |
| 'change 123456 at https://chromium-review.googlesource.com does not ' |
| 'exist or you have no access to it'],), SystemExitMock()), |
| ] |
| with self.assertRaises(SystemExitMock): |
| self.assertEqual(1, git_cl.main(['patch', '123456'])) |
| |
| def _checkout_calls(self): |
| return [ |
| ((['git', 'config', '--local', '--get-regexp', |
| 'branch\\..*\\.rietveldissue'], ), |
| ('branch.retrying.rietveldissue 1111111111\n' |
| 'branch.some-fix.rietveldissue 2222222222\n')), |
| ((['git', 'config', '--local', '--get-regexp', |
| 'branch\\..*\\.gerritissue'], ), |
| ('branch.ger-branch.gerritissue 123456\n' |
| 'branch.gbranch654.gerritissue 654321\n')), |
| ] |
| |
| def test_checkout_gerrit(self): |
| """Tests git cl checkout <issue>.""" |
| self.calls = self._checkout_calls() |
| self.calls += [((['git', 'checkout', 'ger-branch'], ), '')] |
| self.assertEqual(0, git_cl.main(['checkout', '123456'])) |
| |
| def test_checkout_rietveld(self): |
| """Tests git cl checkout <issue>.""" |
| self.calls = self._checkout_calls() |
| self.calls += [((['git', 'checkout', 'some-fix'], ), '')] |
| self.assertEqual(0, git_cl.main(['checkout', '2222222222'])) |
| |
| def test_checkout_not_found(self): |
| """Tests git cl checkout <issue>.""" |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.calls = self._checkout_calls() |
| self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| |
| def test_checkout_no_branch_issues(self): |
| """Tests git cl checkout <issue>.""" |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.calls = [ |
| ((['git', 'config', '--local', '--get-regexp', |
| 'branch\\..*\\.rietveldissue'], ), CERR1), |
| ((['git', 'config', '--local', '--get-regexp', |
| 'branch\\..*\\.gerritissue'], ), CERR1), |
| ] |
| self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| |
| def _test_gerrit_ensure_authenticated_common(self, auth, |
| skip_auth_check=False): |
| self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
| CookiesAuthenticatorMockFactory(hosts_with_creds=auth)) |
| self.mock(git_cl, 'DieWithError', |
| lambda msg, change=None: self._mocked_call(['DieWithError', msg])) |
| self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check) |
| cl = git_cl.Changelist(codereview='gerrit') |
| cl.branch = 'master' |
| cl.branchref = 'refs/heads/master' |
| cl.lookedup_issue = True |
| return cl |
| |
| def test_gerrit_ensure_authenticated_missing(self): |
| cl = self._test_gerrit_ensure_authenticated_common(auth={ |
| 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'), |
| }) |
| self.calls.append( |
| ((['DieWithError', |
| 'Credentials for the following hosts are required:\n' |
| ' chromium-review.googlesource.com\n' |
| 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n' |
| 'You can (re)generate your credentials by visiting ' |
| 'https://chromium-review.googlesource.com/new-password'],), ''),) |
| self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| |
| def test_gerrit_ensure_authenticated_conflict(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| cl = self._test_gerrit_ensure_authenticated_common(auth={ |
| 'chromium.googlesource.com': |
| ('git-one.example.com', None, 'secret1'), |
| 'chromium-review.googlesource.com': |
| ('git-other.example.com', None, 'secret2'), |
| }) |
| self.calls.append( |
| (('ask_for_data', 'If you know what you are doing ' |
| 'press Enter to continue, or Ctrl+C to abort'), '')) |
| self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| |
| def test_gerrit_ensure_authenticated_ok(self): |
| cl = self._test_gerrit_ensure_authenticated_common(auth={ |
| 'chromium.googlesource.com': |
| ('git-same.example.com', None, 'secret'), |
| 'chromium-review.googlesource.com': |
| ('git-same.example.com', None, 'secret'), |
| }) |
| self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| |
| def test_gerrit_ensure_authenticated_skipped(self): |
| cl = self._test_gerrit_ensure_authenticated_common( |
| auth={}, skip_auth_check=True) |
| self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| |
| def test_cmd_set_commit_rietveld(self): |
| self.mock(git_cl._RietveldChangelistImpl, 'SetFlags', |
| lambda _, v: self._mocked_call(['SetFlags', v])) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), |
| 'https://codereview.chromium.org'), |
| ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''), |
| ] |
| self.assertEqual(0, git_cl.main(['set-commit'])) |
| |
| def _cmd_set_commit_gerrit_common(self, vote, notify=None): |
| self.mock(git_cl.gerrit_util, 'SetReview', |
| lambda h, i, labels, notify=None: |
| self._mocked_call(['SetReview', h, i, labels, notify])) |
| |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.feature.gerritissue'],), '123'), |
| ((['git', 'config', 'branch.feature.gerritserver'],), |
| 'https://chromium-review.googlesource.com'), |
| ((['SetReview', 'chromium-review.googlesource.com', 123, |
| {'Commit-Queue': vote}, notify],), ''), |
| ] |
| |
| def test_cmd_set_commit_gerrit_clear(self): |
| self._cmd_set_commit_gerrit_common(0) |
| self.assertEqual(0, git_cl.main(['set-commit', '-c'])) |
| |
| def test_cmd_set_commit_gerrit_dry(self): |
| self._cmd_set_commit_gerrit_common(1, notify='NONE') |
| self.assertEqual(0, git_cl.main(['set-commit', '-d'])) |
| |
| def test_cmd_set_commit_gerrit(self): |
| self._cmd_set_commit_gerrit_common(2) |
| self.assertEqual(0, git_cl.main(['set-commit'])) |
| |
| def test_description_display(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| |
| self.mock(git_cl, 'Changelist', ChangelistMock) |
| ChangelistMock.desc = 'foo\n' |
| |
| self.assertEqual(0, git_cl.main(['description', '-d'])) |
| self.assertEqual('foo\n', out.getvalue()) |
| |
| def test_description_rietveld(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar') |
| |
| self.assertEqual(0, git_cl.main([ |
| 'description', '-d', '--rietveld', 'https://code.review.org/123123'])) |
| self.assertEqual('foobar\n', out.getvalue()) |
| |
| def test_StatusFieldOverrideIssueMissingArgs(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stderr', out) |
| |
| try: |
| self.assertEqual(git_cl.main(['status', '--issue', '1']), 0) |
| except SystemExit as ex: |
| self.assertEqual(ex.code, 2) |
| self.assertRegexpMatches(out.getvalue(), r'--issue must be specified') |
| |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stderr', out) |
| |
| try: |
| self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0) |
| except SystemExit as ex: |
| self.assertEqual(ex.code, 2) |
| self.assertRegexpMatches(out.getvalue(), r'--field must be specified') |
| |
| def test_StatusFieldOverrideIssue(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| |
| def assertIssue(cl_self, *_args): |
| self.assertEquals(cl_self.issue, 1) |
| return 'foobar' |
| |
| self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| self.calls = [ |
| ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ] |
| self.assertEqual( |
| git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']), |
| 0) |
| self.assertEqual(out.getvalue(), 'foobar\n') |
| |
| def test_SetCloseOverrideIssue(self): |
| def assertIssue(cl_self, *_args): |
| self.assertEquals(cl_self.issue, 1) |
| return 'foobar' |
| |
| self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None) |
| self.calls = [ |
| ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ] |
| self.assertEqual( |
| git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0) |
| |
| def test_SetCommitOverrideIssue(self): |
| def assertIssue(cl_self, *_args): |
| self.assertEquals(cl_self.issue, 1) |
| return 'foobar' |
| |
| self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None) |
| self.calls = [ |
| ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ((['git', 'symbolic-ref', 'HEAD'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ((['git', 'config', 'rietveld.server'],), ''), |
| ] |
| self.assertEqual( |
| git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0) |
| |
| def test_description_gerrit(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| self.calls = [ |
| (('GetChangeDetail', 'code.review.org', |
| '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']), |
| { |
| 'current_revision': 'sha1', |
| 'revisions': {'sha1': { |
| 'commit': {'message': 'foobar'}, |
| }}, |
| }), |
| ] |
| self.assertEqual(0, git_cl.main([ |
| 'description', 'https://code.review.org/123123', '-d', '--gerrit'])) |
| self.assertEqual('foobar\n', out.getvalue()) |
| |
| def test_description_set_raw(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| |
| self.mock(git_cl, 'Changelist', ChangelistMock) |
| self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi')) |
| |
| self.assertEqual(0, git_cl.main(['description', '-n', 'hihi'])) |
| self.assertEqual('hihi', ChangelistMock.desc) |
| |
| def test_description_appends_bug_line(self): |
| current_desc = 'Some.\n\nChange-Id: xxx' |
| |
| def RunEditor(desc, _, **kwargs): |
| self.assertEquals( |
| '# Enter a description of the change.\n' |
| '# This will be displayed on the codereview site.\n' |
| '# The first line will also be used as the subject of the review.\n' |
| '#--------------------This line is 72 characters long' |
| '--------------------\n' |
| 'Some.\n\nChange-Id: xxx\nBug: ', |
| desc) |
| # Simulate user changing something. |
| return 'Some.\n\nChange-Id: xxx\nBug: 123' |
| |
| def UpdateDescriptionRemote(_, desc, force=False): |
| self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123') |
| |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.mock(git_cl.Changelist, 'GetDescription', |
| lambda *args: current_desc) |
| self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote', |
| UpdateDescriptionRemote) |
| self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.gerritissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.bug-prefix'],), CERR1), |
| ((['git', 'config', 'core.editor'],), 'vi'), |
| ] |
| self.assertEqual(0, git_cl.main(['description', '--gerrit'])) |
| |
| def test_description_set_stdin(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| |
| self.mock(git_cl, 'Changelist', ChangelistMock) |
| self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman')) |
| |
| self.assertEqual(0, git_cl.main(['description', '-n', '-'])) |
| self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc) |
| |
| def test_archive(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| |
| self.calls = \ |
| [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'config', 'branch.foo.rietveldissue'],), '456'), |
| ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.bar.gerritissue'],), '789'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''), |
| ((['git', 'branch', '-D', 'foo'],), '')] |
| |
| self.mock(git_cl, 'get_cl_statuses', |
| lambda branches, fine_grained, max_processes: |
| [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
| (MockChangelistWithBranchAndIssue('bar', 789), 'open')]) |
| |
| self.assertEqual(0, git_cl.main(['archive', '-f'])) |
| |
| def test_archive_current_branch_fails(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.calls = \ |
| [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 'refs/heads/master'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master')] |
| |
| self.mock(git_cl, 'get_cl_statuses', |
| lambda branches, fine_grained, max_processes: |
| [(MockChangelistWithBranchAndIssue('master', 1), 'closed')]) |
| |
| self.assertEqual(1, git_cl.main(['archive', '-f'])) |
| |
| def test_archive_dry_run(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| |
| self.calls = \ |
| [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'config', 'branch.foo.rietveldissue'],), '456'), |
| ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.bar.gerritissue'],), '789'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'),] |
| |
| self.mock(git_cl, 'get_cl_statuses', |
| lambda branches, fine_grained, max_processes: |
| [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
| (MockChangelistWithBranchAndIssue('bar', 789), 'open')]) |
| |
| self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run'])) |
| |
| def test_archive_no_tags(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| |
| self.calls = \ |
| [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
| ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'config', 'branch.foo.rietveldissue'],), '456'), |
| ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.bar.gerritissue'],), '789'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| ((['git', 'branch', '-D', 'foo'],), '')] |
| |
| self.mock(git_cl, 'get_cl_statuses', |
| lambda branches, fine_grained, max_processes: |
| [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
| (MockChangelistWithBranchAndIssue('bar', 789), 'open')]) |
| |
| self.assertEqual(0, git_cl.main(['archive', '-f', '--notags'])) |
| |
| def test_cmd_issue_erase_existing(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.feature.gerritissue'],), '123'), |
| # Let this command raise exception (retcode=1) - it should be ignored. |
| ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],), |
| CERR1), |
| ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''), |
| ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''), |
| ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''), |
| ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],), |
| ''), |
| ] |
| self.assertEqual(0, git_cl.main(['issue', '0'])) |
| |
| def test_cmd_issue_json(self): |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'rietveld.server'],), |
| 'https://codereview.chromium.org'), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), ''), |
| (('write_json', 'output.json', |
| {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}), |
| ''), |
| ] |
| self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json'])) |
| |
| def test_git_cl_try_default_cq_dry_run(self): |
| self.mock(git_cl.Changelist, 'GetChange', |
| lambda _, *a: ( |
| self._mocked_call(['GetChange']+list(a)))) |
| self.mock(git_cl.presubmit_support, 'DoGetTryMasters', |
| lambda *_, **__: ( |
| self._mocked_call(['DoGetTryMasters']))) |
| self.mock(git_cl._RietveldChangelistImpl, 'SetCQState', |
| lambda _, s: self._mocked_call(['SetCQState', s])) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| ((['git', 'config', 'rietveld.server'],), |
| 'https://codereview.chromium.org'), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), ''), |
| ((['git', 'config', 'branch.feature.merge'],), 'feature'), |
| ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| ((['get_or_create_merge_base', 'feature', 'feature'],), |
| 'fake_ancestor_sha'), |
| ((['GetChange', 'fake_ancestor_sha', None], ), |
| git_cl.presubmit_support.GitChange( |
| '', '', '', '', '', '', '', '')), |
| ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| ((['DoGetTryMasters'], ), None), |
| ((['SetCQState', git_cl._CQState.DRY_RUN], ), None), |
| ] |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| self.assertEqual(0, git_cl.main(['try'])) |
| self.assertEqual( |
| out.getvalue(), |
| 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n') |
| |
| def test_git_cl_try_default_cq_dry_run_gerrit(self): |
| self.mock(git_cl.Changelist, 'GetChange', |
| lambda _, *a: ( |
| self._mocked_call(['GetChange']+list(a)))) |
| self.mock(git_cl.presubmit_support, 'DoGetTryMasters', |
| lambda *_, **__: ( |
| self._mocked_call(['DoGetTryMasters']))) |
| self.mock(git_cl._GerritChangelistImpl, 'SetCQState', |
| lambda _, s: self._mocked_call(['SetCQState', s])) |
| |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.feature.gerritissue'],), '123456'), |
| ((['git', 'config', 'branch.feature.gerritserver'],), |
| 'https://chromium-review.googlesource.com'), |
| (('GetChangeDetail', 'chromium-review.googlesource.com', '123456', |
| ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), { |
| 'project': 'depot_tools', |
| 'status': 'OPEN', |
| 'owner': {'email': '[email protected]'}, |
| 'revisions': { |
| 'deadbeaf': { |
| '_number': 6, |
| }, |
| 'beeeeeef': { |
| '_number': 7, |
| 'fetch': {'http': { |
| 'url': 'https://chromium.googlesource.com/depot_tools', |
| 'ref': 'refs/changes/56/123456/7' |
| }}, |
| }, |
| }, |
| }), |
| ((['git', 'config', 'branch.feature.merge'],), 'feature'), |
| ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| ((['get_or_create_merge_base', 'feature', 'feature'],), |
| 'fake_ancestor_sha'), |
| ((['GetChange', 'fake_ancestor_sha', None], ), |
| git_cl.presubmit_support.GitChange( |
| '', '', '', '', '', '', '', '')), |
| ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| ((['DoGetTryMasters'], ), None), |
| ((['SetCQState', git_cl._CQState.DRY_RUN], ), None), |
| ] |
| out = StringIO.StringIO() |
| self.mock(git_cl.sys, 'stdout', out) |
| self.assertEqual(0, git_cl.main(['try'])) |
| self.assertEqual( |
| out.getvalue(), |
| 'Scheduling CQ dry run on: ' |
| 'https://chromium-review.googlesource.com/123456\n') |
| |
| def test_git_cl_try_buildbucket_with_properties_rietveld(self): |
| self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', |
| lambda _: { |
| 'owner_email': '[email protected]', |
| 'private': False, |
| 'closed': False, |
| 'project': 'depot_tools', |
| 'patchsets': [20001], |
| }) |
| self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4') |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), |
| 'https://codereview.chromium.org'), |
| ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1), |
| ] |
| |
| def _buildbucket_retry(*_, **kw): |
| # self.maxDiff = 10000 |
| body = json.loads(kw['body']) |
| self.assertEqual(len(body['builds']), 1) |
| build = body['builds'][0] |
| params = json.loads(build.pop('parameters_json')) |
| self.assertEqual(params, { |
| u'builder_name': u'win', |
| u'changes': [{u'author': {u'email': u'[email protected]'}, |
| u'revision': None}], |
| u'properties': { |
| u'category': u'git_cl_try', |
| u'issue': 123, |
| u'key': u'val', |
| u'json': [{u'a': 1}, None], |
| u'master': u'tryserver.chromium', |
| u'patch_project': u'depot_tools', |
| u'patch_storage': u'rietveld', |
| u'patchset': 20001, |
| u'rietveld': u'https://codereview.chromium.org', |
| } |
| }) |
| self.assertEqual(build, { |
| u'bucket': u'master.tryserver.chromium', |
| u'client_operation_id': u'uuid4', |
| u'tags': [u'builder:win', |
| u'buildset:patch/rietveld/codereview.chromium.org/123/20001', |
| u'user_agent:git_cl_try', |
| u'master:tryserver.chromium'], |
| }) |
| |
| self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.assertEqual(0, git_cl.main([ |
| 'try', '-m', 'tryserver.chromium', '-b', 'win', |
| '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])) |
| self.assertRegexpMatches( |
| git_cl.sys.stdout.getvalue(), |
| 'Tried jobs on:\nBucket: master.tryserver.chromium') |
| |
| def test_git_cl_try_buildbucket_with_properties_gerrit(self): |
| self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7) |
| self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4') |
| |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.feature.gerritissue'],), '123456'), |
| ((['git', 'config', 'branch.feature.gerritserver'],), |
| 'https://chromium-review.googlesource.com'), |
| (('GetChangeDetail', 'chromium-review.googlesource.com', '123456', |
| ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), { |
| 'project': 'depot_tools', |
| 'status': 'OPEN', |
| 'owner': {'email': '[email protected]'}, |
| 'revisions': { |
| 'deadbeaf': { |
| '_number': 6, |
| }, |
| 'beeeeeef': { |
| '_number': 7, |
| 'fetch': {'http': { |
| 'url': 'https://chromium.googlesource.com/depot_tools', |
| 'ref': 'refs/changes/56/123456/7' |
| }}, |
| }, |
| }, |
| }), |
| ] |
| |
| def _buildbucket_retry(*_, **kw): |
| # self.maxDiff = 10000 |
| body = json.loads(kw['body']) |
| self.assertEqual(len(body['builds']), 1) |
| build = body['builds'][0] |
| params = json.loads(build.pop('parameters_json')) |
| self.assertEqual(params, { |
| u'builder_name': u'win', |
| u'changes': [{u'author': {u'email': u'[email protected]'}, |
| u'revision': None}], |
| u'properties': { |
| u'category': u'git_cl_try', |
| u'key': u'val', |
| u'json': [{u'a': 1}, None], |
| u'master': u'tryserver.chromium', |
| |
| u'patch_gerrit_url': |
| u'https://chromium-review.googlesource.com', |
| u'patch_issue': 123456, |
| u'patch_project': u'depot_tools', |
| u'patch_ref': u'refs/changes/56/123456/7', |
| u'patch_repository_url': |
| u'https://chromium.googlesource.com/depot_tools', |
| u'patch_set': 7, |
| u'patch_storage': u'gerrit', |
| } |
| }) |
| self.assertEqual(build, { |
| u'bucket': u'master.tryserver.chromium', |
| u'client_operation_id': u'uuid4', |
| u'tags': [ |
| u'builder:win', |
| u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7', |
| u'user_agent:git_cl_try', |
| u'master:tryserver.chromium'], |
| }) |
| |
| self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.assertEqual(0, git_cl.main([ |
| 'try', '-m', 'tryserver.chromium', '-b', 'win', |
| '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])) |
| self.assertRegexpMatches( |
| git_cl.sys.stdout.getvalue(), |
| 'Tried jobs on:\nBucket: master.tryserver.chromium') |
| |
| def test_git_cl_try_buildbucket_bucket_flag(self): |
| self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', |
| lambda _: { |
| 'owner_email': '[email protected]', |
| 'private': False, |
| 'closed': False, |
| 'project': 'depot_tools', |
| 'patchsets': [20001], |
| }) |
| self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4') |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), |
| 'https://codereview.chromium.org'), |
| ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1), |
| ] |
| |
| def _buildbucket_retry(*_, **kw): |
| body = json.loads(kw['body']) |
| self.assertEqual(len(body['builds']), 1) |
| build = body['builds'][0] |
| params = json.loads(build.pop('parameters_json')) |
| self.assertEqual(params, { |
| u'builder_name': u'win', |
| u'changes': [{u'author': {u'email': u'[email protected]'}, |
| u'revision': None}], |
| u'properties': { |
| u'category': u'git_cl_try', |
| u'issue': 123, |
| u'patch_project': u'depot_tools', |
| u'patch_storage': u'rietveld', |
| u'patchset': 20001, |
| u'rietveld': u'https://codereview.chromium.org', |
| } |
| }) |
| self.assertEqual(build, { |
| u'bucket': u'test.bucket', |
| u'client_operation_id': u'uuid4', |
| u'tags': [u'builder:win', |
| u'buildset:patch/rietveld/codereview.chromium.org/123/20001', |
| u'user_agent:git_cl_try'], |
| }) |
| |
| self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.assertEqual(0, git_cl.main([ |
| 'try', '-B', 'test.bucket', '-b', 'win'])) |
| self.assertRegexpMatches( |
| git_cl.sys.stdout.getvalue(), |
| 'Tried jobs on:\nBucket: test.bucket') |
| |
| def test_git_cl_try_bots_on_multiple_masters(self): |
| self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), |
| 'https://codereview.chromium.org'), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1), |
| ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| ] |
| |
| def _buildbucket_retry(*_, **kw): |
| body = json.loads(kw['body']) |
| self.assertEqual(len(body['builds']), 2) |
| |
| first_build_params = json.loads(body['builds'][0]['parameters_json']) |
| self.assertEqual(first_build_params['builder_name'], 'builder1') |
| self.assertEqual(first_build_params['properties']['master'], 'master1') |
| |
| first_build_params = json.loads(body['builds'][1]['parameters_json']) |
| self.assertEqual(first_build_params['builder_name'], 'builder2') |
| self.assertEqual(first_build_params['properties']['master'], 'master2') |
| |
| self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| |
| self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO( |
| json.dumps({'builder1': ['master1'], 'builder2': ['master2']}))) |
| |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.assertEqual( |
| 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2'])) |
| self.assertEqual( |
| git_cl.sys.stdout.getvalue(), |
| 'Tried jobs on:\n' |
| 'Bucket: master.master1\n' |
| ' builder1: []\n' |
| 'Bucket: master.master2\n' |
| ' builder2: []\n' |
| 'To see results here, run: git cl try-results\n' |
| 'To see results in browser, run: git cl web\n') |
| |
| def _common_GerritCommitMsgHookCheck(self): |
| self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| self.mock(git_cl.os.path, 'abspath', |
| lambda path: self._mocked_call(['abspath', path])) |
| self.mock(git_cl.os.path, 'exists', |
| lambda path: self._mocked_call(['exists', path])) |
| self.mock(git_cl.gclient_utils, 'FileRead', |
| lambda path: self._mocked_call(['FileRead', path])) |
| self.mock(git_cl.gclient_utils, 'rm_file_or_tree', |
| lambda path: self._mocked_call(['rm_file_or_tree', path])) |
| self.calls = [ |
| ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| ((['abspath', '../'],), '/abs/git_repo_root'), |
| ] |
| return git_cl.Changelist(codereview='gerrit', issue=123) |
| |
| def test_GerritCommitMsgHookCheck_custom_hook(self): |
| cl = self._common_GerritCommitMsgHookCheck() |
| self.calls += [ |
| ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True), |
| ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| '#!/bin/sh\necho "custom hook"') |
| ] |
| cl._codereview_impl._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) |
| |
| def test_GerritCommitMsgHookCheck(self): |
| cl = self._common_GerritCommitMsgHookCheck() |
| self.calls += [ |
| ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True), |
| ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'), |
| (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'), |
| ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| ''), |
| ] |
| cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True) |
| |
| def test_GerritCmdLand(self): |
| self.calls += [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.gerritsquashhash'],), |
| 'deadbeaf'), |
| ((['git', 'diff', 'deadbeaf'],), ''), # No diff. |
| ((['git', 'config', 'branch.feature.gerritserver'],), |
| 'chromium-review.googlesource.com'), |
| ] |
| cl = git_cl.Changelist(issue=123, codereview='gerrit') |
| cl._codereview_impl._GetChangeDetail = lambda _: { |
| 'labels': {}, |
| 'current_revision': 'deadbeaf', |
| } |
| cl._codereview_impl._GetChangeCommit = lambda: { |
| 'commit': 'deadbeef', |
| 'web_links': [{'name': 'gitiles', |
| 'url': 'https://git.googlesource.com/test/+/deadbeef'}], |
| } |
| cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None |
| out = StringIO.StringIO() |
| self.mock(sys, 'stdout', out) |
| self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True)) |
| self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted') |
| self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef') |
| |
| BUILDBUCKET_BUILDS_MAP = { |
| '9000': { |
| 'id': '9000', |
| 'status': 'STARTED', |
| 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2', |
| 'result_details_json': '{"properties": {}}', |
| 'bucket': 'master.x.y', |
| 'created_by': 'user:[email protected]', |
| 'created_ts': '147200002222000', |
| 'parameters_json': '{"builder_name": "my-builder", "category": ""}', |
| }, |
| '8000': { |
| 'id': '8000', |
| 'status': 'COMPLETED', |
| 'result': 'FAILURE', |
| 'failure_reason': 'BUILD_FAILURE', |
| 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1', |
| 'result_details_json': '{"properties": {}}', |
| 'bucket': 'master.x.y', |
| 'created_by': 'user:[email protected]', |
| 'created_ts': '147200001111000', |
| 'parameters_json': '{"builder_name": "my-builder", "category": ""}', |
| }, |
| } |
| |
| def test_write_try_results_json(self): |
| expected_output = [ |
| { |
| 'buildbucket_id': '8000', |
| 'bucket': 'master.x.y', |
| 'builder_name': 'my-builder', |
| 'status': 'COMPLETED', |
| 'result': 'FAILURE', |
| 'failure_reason': 'BUILD_FAILURE', |
| 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1', |
| }, |
| { |
| 'buildbucket_id': '9000', |
| 'bucket': 'master.x.y', |
| 'builder_name': 'my-builder', |
| 'status': 'STARTED', |
| 'result': None, |
| 'failure_reason': None, |
| 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2', |
| } |
| ] |
| self.calls = [(('write_json', 'output.json', expected_output), '')] |
| git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP) |
| |
| def _setup_fetch_try_jobs(self, most_recent_patchset=20001): |
| out = StringIO.StringIO() |
| self.mock(sys, 'stdout', out) |
| self.mock(git_cl.Changelist, 'GetMostRecentPatchset', |
| lambda *args: most_recent_patchset) |
| self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg: |
| self._mocked_call(['get_authenticator_for_host', host])) |
| self.mock(git_cl, '_buildbucket_retry', lambda *_, **__: |
| self._mocked_call(['_buildbucket_retry'])) |
| |
| def _setup_fetch_try_jobs_rietveld(self, *request_results): |
| self._setup_fetch_try_jobs(most_recent_patchset=20001) |
| self.calls += [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), '1'), |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| ((['git', 'config', 'branch.feature.rietveldserver'],), |
| 'codereview.example.com'), |
| ((['get_authenticator_for_host', 'codereview.example.com'],), |
| AuthenticatorMock()), |
| ] + [((['_buildbucket_retry'],), r) for r in request_results] |
| |
| def test_fetch_try_jobs_none_rietveld(self): |
| self._setup_fetch_try_jobs_rietveld({}) |
| # Simulate that user isn't logged in. |
| self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False) |
| self.assertEqual(0, git_cl.main(['try-results'])) |
| self.assertRegexpMatches(sys.stdout.getvalue(), |
| 'Warning: Some results might be missing') |
| self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs') |
| |
| def test_fetch_try_jobs_some_rietveld(self): |
| self._setup_fetch_try_jobs_rietveld({ |
| 'builds': self.BUILDBUCKET_BUILDS_MAP.values(), |
| }) |
| self.assertEqual(0, git_cl.main(['try-results'])) |
| self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:') |
| self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:') |
| self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs') |
| |
| def _setup_fetch_try_jobs_gerrit(self, *request_results): |
| self._setup_fetch_try_jobs(most_recent_patchset=13) |
| self.calls += [ |
| ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| ((['git', 'config', 'branch.feature.gerritissue'],), '1'), |
| # TODO(tandrii): Uncomment the below if we decide to support checking |
| # patchsets for Gerrit. |
| # Simulate that Gerrit has more patchsets than local. |
| # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'), |
| ((['git', 'config', 'branch.feature.gerritserver'],), |
| 'https://x-review.googlesource.com'), |
| ((['get_authenticator_for_host', 'x-review.googlesource.com'],), |
| AuthenticatorMock()), |
| ] + [((['_buildbucket_retry'],), r) for r in request_results] |
| |
| def test_fetch_try_jobs_none_gerrit(self): |
| self._setup_fetch_try_jobs_gerrit({}) |
| self.assertEqual(0, git_cl.main(['try-results'])) |
| # TODO(tandrii): Uncomment the below if we decide to support checking |
| # patchsets for Gerrit. |
| # self.assertRegexpMatches( |
| # sys.stdout.getvalue(), |
| # r'Warning: Codereview server has newer patchsets \(13\)') |
| self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs') |
| |
| def test_fetch_try_jobs_some_gerrit(self): |
| self._setup_fetch_try_jobs_gerrit({ |
| 'builds': self.BUILDBUCKET_BUILDS_MAP.values(), |
| }) |
| # TODO(tandrii): Uncomment the below if we decide to support checking |
| # patchsets for Gerrit. |
| # self.calls.remove( |
| # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12')) |
| self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5'])) |
| |
| # ... and doesn't result in warning. |
| self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning') |
| self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:') |
| self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:') |
| self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs') |
| |
| def _mock_gerrit_changes_for_detail_cache(self): |
| self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host') |
| |
| def test_gerrit_change_detail_cache_normalize(self): |
| self._mock_gerrit_changes_for_detail_cache() |
| self.calls = [ |
| (('GetChangeDetail', 'host', '2', ['CASE']), 'b'), |
| ] |
| cl = git_cl.Changelist(codereview='gerrit') |
| self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b') |
| self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b') |
| self.assertEqual(cl._GetChangeDetail(issue='2'), 'b') |
| self.assertEqual(cl._GetChangeDetail(issue=2), 'b') |
| |
| def test_gerrit_change_detail_cache_simple(self): |
| self._mock_gerrit_changes_for_detail_cache() |
| self.calls = [ |
| (('GetChangeDetail', 'host', '1', []), 'a'), |
| (('GetChangeDetail', 'host', '2', []), 'b'), |
| (('GetChangeDetail', 'host', '2', []), 'b2'), |
| ] |
| cl = git_cl.Changelist(issue=1, codereview='gerrit') |
| self.assertEqual(cl._GetChangeDetail(), 'a') # Miss. |
| self.assertEqual(cl._GetChangeDetail(), 'a') |
| self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss. |
| self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss. |
| self.assertEqual(cl._GetChangeDetail(), 'a') |
| self.assertEqual(cl._GetChangeDetail(issue=2), 'b2') |
| |
| def test_gerrit_change_detail_cache_options(self): |
| self._mock_gerrit_changes_for_detail_cache() |
| self.calls = [ |
| (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'), |
| (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'), |
| (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True |
| (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache. |
| ] |
| cl = git_cl.Changelist(issue=1, codereview='gerrit') |
| self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab') |
| self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab') |
| self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab') |
| self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab') |
| self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab') |
| self.assertEqual(cl._GetChangeDetail(), 'cab') |
| |
| self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad') |
| self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab') |
| self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad') |
| self.assertEqual(cl._GetChangeDetail(), 'cab') |
| |
| # Finally, no_cache should invalidate all caches for given change. |
| self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a') |
| self.assertEqual(cl._GetChangeDetail(options=['B']), 'b') |
| |
| def test_gerrit_description_caching(self): |
| def gen_detail(rev, desc): |
| return { |
| 'current_revision': rev, |
| 'revisions': {rev: {'commit': {'message': desc}}} |
| } |
| self.calls = [ |
| (('GetChangeDetail', 'host', '1', |
| ['CURRENT_REVISION', 'CURRENT_COMMIT']), |
| gen_detail('rev1', 'desc1')), |
| (('GetChangeDetail', 'host', '1', |
| ['CURRENT_REVISION', 'CURRENT_COMMIT']), |
| gen_detail('rev2', 'desc2')), |
| ] |
| |
| self._mock_gerrit_changes_for_detail_cache() |
| cl = git_cl.Changelist(issue=1, codereview='gerrit') |
| self.assertEqual(cl.GetDescription(), 'desc1') |
| self.assertEqual(cl.GetDescription(), 'desc1') # cache hit. |
| self.assertEqual(cl.GetDescription(force=True), 'desc2') |
| |
| def test_print_current_creds(self): |
| class CookiesAuthenticatorMock(object): |
| def __init__(self): |
| self.gitcookies = { |
| 'host.googlesource.com': ('user', 'pass'), |
| 'host-review.googlesource.com': ('user', 'pass'), |
| } |
| self.netrc = self |
| self.netrc.hosts = { |
| 'github.com': ('user2', None, 'pass2'), |
| 'host2.googlesource.com': ('user3', None, 'pass'), |
| } |
| self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
| CookiesAuthenticatorMock) |
| self.mock(sys, 'stdout', StringIO.StringIO()) |
| git_cl._GitCookiesChecker().print_current_creds(include_netrc=True) |
| self.assertEqual(list(sys.stdout.getvalue().splitlines()), [ |
| ' Host\t User\t Which file', |
| '============================\t=====\t===========', |
| 'host-review.googlesource.com\t user\t.gitcookies', |
| ' host.googlesource.com\t user\t.gitcookies', |
| ' host2.googlesource.com\tuser3\t .netrc', |
| ]) |
| sys.stdout.buf = '' |
| git_cl._GitCookiesChecker().print_current_creds(include_netrc=False) |
| self.assertEqual(list(sys.stdout.getvalue().splitlines()), [ |
| ' Host\tUser\t Which file', |
| '============================\t====\t===========', |
| 'host-review.googlesource.com\tuser\t.gitcookies', |
| ' host.googlesource.com\tuser\t.gitcookies', |
| ]) |
| |
| def _common_creds_check_mocks(self): |
| def exists_mock(path): |
| dirname = os.path.dirname(path) |
| if dirname == os.path.expanduser('~'): |
| dirname = '~' |
| base = os.path.basename(path) |
| if base in ('.netrc', '.gitcookies'): |
| return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base)) |
| # git cl also checks for existence other files not relevant to this test. |
| return None |
| self.mock(os.path, 'exists', exists_mock) |
| self.mock(sys, 'stdout', StringIO.StringIO()) |
| |
| def test_creds_check_gitcookies_not_configured(self): |
| self._common_creds_check_mocks() |
| self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds', |
| lambda _, include_netrc=False: []) |
| self.calls = [ |
| ((['git', 'config', '--global', 'http.cookiefile'],), CERR1), |
| (('os.path.exists', '~/.netrc'), True), |
| (('ask_for_data', 'Press Enter to setup .gitcookies, ' |
| 'or Ctrl+C to abort'), ''), |
| ((['git', 'config', '--global', 'http.cookiefile', |
| os.path.expanduser('~/.gitcookies')], ), ''), |
| ] |
| self.assertEqual(0, git_cl.main(['creds-check'])) |
| self.assertRegexpMatches( |
| sys.stdout.getvalue(), |
| '^You seem to be using outdated .netrc for git credentials:') |
| self.assertRegexpMatches( |
| sys.stdout.getvalue(), |
| '\nConfigured git to use .gitcookies from') |
| |
| def test_creds_check_gitcookies_configured_custom_broken(self): |
| self._common_creds_check_mocks() |
| self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds', |
| lambda _, include_netrc=False: []) |
| self.calls = [ |
| ((['git', 'config', '--global', 'http.cookiefile'],), |
| '/custom/.gitcookies'), |
| (('os.path.exists', '/custom/.gitcookies'), False), |
| (('ask_for_data', 'Reconfigure git to use default .gitcookies? ' |
| 'Press Enter to reconfigure, or Ctrl+C to abort'), ''), |
| ((['git', 'config', '--global', 'http.cookiefile', |
| os.path.expanduser('~/.gitcookies')], ), ''), |
| ] |
| self.assertEqual(0, git_cl.main(['creds-check'])) |
| self.assertRegexpMatches( |
| sys.stdout.getvalue(), |
| 'WARNING: You have configured custom path to .gitcookies: ') |
| self.assertRegexpMatches( |
| sys.stdout.getvalue(), |
| 'However, your configured .gitcookies file is missing.') |
| |
| def test_git_cl_comment_add_rietveld(self): |
| self.mock(git_cl._RietveldChangelistImpl, 'AddComment', |
| lambda _, message: self._mocked_call('AddComment', message)) |
| self.calls = [ |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'), |
| (('AddComment', 'msg'), ''), |
| ] |
| self.assertEqual(0, git_cl.main(['comment', '--rietveld', |
| '-i', '10', '-a', 'msg'])) |
| |
| def test_git_cl_comment_add_gerrit(self): |
| self.mock(git_cl.gerrit_util, 'SetReview', |
| lambda host, change, msg: |
| self._mocked_call('SetReview', host, change, msg)) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| ((['git', 'config', 'rietveld.upstream-branch'],), CERR1), |
| ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n' |
| 'origin/master'), |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://chromium.googlesource.com/infra/infra'), |
| (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None), |
| ] |
| self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10', |
| '-a', 'msg'])) |
| |
| def test_git_cl_comments_fetch_rietveld(self): |
| self.mock(sys, 'stdout', StringIO.StringIO()) |
| self.calls = [ |
| ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'), |
| ] * 2 |
| self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: { |
| 'messages': [ |
| {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270', |
| 'disapproval': False, 'approval': True, 'sender': '[email protected]'}, |
| {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270', |
| 'disapproval': True, 'approval': False, 'sender': '[email protected]'}, |
| # Intentionally wrong order here. |
| {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270', |
| 'disapproval': False, 'approval': False, |
| 'sender': '[email protected]'}, |
| ], |
| 'owner_email': '[email protected]', |
| }) |
| expected_comments_summary = [ |
| git_cl._CommentSummary( |
| message='lgtm', |
| date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270), |
| disapproval=False, approval=True, sender='[email protected]'), |
| git_cl._CommentSummary( |
| message='not lgtm', |
| date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270), |
| disapproval=True, approval=False, sender='[email protected]'), |
| # Note: same order as in whatever Rietveld returns. |
| git_cl._CommentSummary( |
| message='PTAL', |
| date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270), |
| disapproval=False, approval=False, sender='[email protected]'), |
| ] |
| cl = git_cl.Changelist(codereview='rietveld', issue=1) |
| self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary) |
| |
| with git_cl.gclient_utils.temporary_directory() as tempdir: |
| out_file = os.path.abspath(os.path.join(tempdir, 'out.json')) |
| self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10', |
| '-j', out_file])) |
| with open(out_file) as f: |
| read = json.load(f) |
| self.assertEqual(len(read), 3) |
| self.assertEqual(read[0], { |
| 'date': '2000-03-13 20:49:34.515270', |
| 'message': 'PTAL', |
| 'approval': False, |
| 'disapproval': False, |
| 'sender': '[email protected]'}) |
| self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270') |
| self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270') |
| |
| def test_git_cl_comments_fetch_gerrit(self): |
| self.mock(sys, 'stdout', StringIO.StringIO()) |
| self.calls = [ |
| ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| ((['git', 'config', 'rietveld.upstream-branch'],), CERR1), |
| ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n' |
| 'origin/master'), |
| ((['git', 'config', 'remote.origin.url'],), |
| 'https://chromium.googlesource.com/infra/infra'), |
| (('GetChangeDetail', 'chromium-review.googlesource.com', '1', |
| ['MESSAGES', 'DETAILED_ACCOUNTS']), { |
| 'owner': {'email': '[email protected]'}, |
| 'messages': [ |
| { |
| u'_revision_number': 1, |
| u'author': { |
| u'_account_id': 1111084, |
| u'email': u'[email protected]', |
| u'name': u'Commit Bot' |
| }, |
| u'date': u'2017-03-15 20:08:45.000000000', |
| u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b', |
| u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...', |
| u'tag': u'autogenerated:cq:dry-run' |
| }, |
| { |
| u'_revision_number': 2, |
| u'author': { |
| u'_account_id': 11151243, |
| u'email': u'[email protected]', |
| u'name': u'owner' |
| }, |
| u'date': u'2017-03-16 20:00:41.000000000', |
| u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234', |
| u'message': u'PTAL', |
| }, |
| { |
| u'_revision_number': 2, |
| u'author': { |
| u'_account_id': 148512 , |
| u'email': u'[email protected]', |
| u'name': u'reviewer' |
| }, |
| u'date': u'2017-03-17 05:19:37.500000000', |
| u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568', |
| u'message': u'Patch Set 2: Code-Review+1', |
| }, |
| ] |
| }) |
| ] * 2 |
| expected_comments_summary = [ |
| git_cl._CommentSummary( |
| message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...', |
| date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0), |
| disapproval=False, approval=False, sender=u'[email protected]'), |
| git_cl._CommentSummary( |
| message=u'PTAL', |
| date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0), |
| disapproval=False, approval=False, sender=u'[email protected]'), |
| git_cl._CommentSummary( |
| message=u'Patch Set 2: Code-Review+1', |
| date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000), |
| disapproval=False, approval=False, sender=u'[email protected]'), |
| ] |
| cl = git_cl.Changelist(codereview='gerrit', issue=1) |
| self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary) |
| |
| with git_cl.gclient_utils.temporary_directory() as tempdir: |
| out_file = os.path.abspath(os.path.join(tempdir, 'out.json')) |
| self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1', |
| '-j', out_file])) |
| with open(out_file) as f: |
| read = json.load(f) |
| self.assertEqual(len(read), 3) |
| self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000') |
| self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000') |
| self.assertEqual(read[2], { |
| u'date': u'2017-03-17 05:19:37.500000', |
| u'message': u'Patch Set 2: Code-Review+1', |
| u'approval': False, |
| u'disapproval': False, |
| u'sender': u'[email protected]'}) |
| |
| |
| if __name__ == '__main__': |
| logging.basicConfig( |
| level=logging.DEBUG if '-v' in sys.argv else logging.ERROR) |
| unittest.main() |