| Index: tests/presubmit_unittest.py
|
| diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
|
| index 4658a698a324a8c260b6142e846435ab2bebf499..8224ae1bdd28bbbfbfcc61c7579e935d86019b1c 100755
|
| --- a/tests/presubmit_unittest.py
|
| +++ b/tests/presubmit_unittest.py
|
| @@ -2572,7 +2572,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
|
|
|
| def AssertOwnersWorks(self, tbr=False, issue='1', approvers=None,
|
| reviewers=None, is_committing=True, rietveld_response=None,
|
| - uncovered_files=None, expected_output='', author_counts_as_owner=True):
|
| + uncovered_files=None, expected_output='', author_counts_as_owner=True,
|
| + manually_specified_reviewers=None):
|
| if approvers is None:
|
| # The set of people who lgtm'ed a change.
|
| approvers = set()
|
| @@ -2583,11 +2584,13 @@ class CannedChecksUnittest(PresubmitTestsBase):
|
| reviewers = approvers
|
| if uncovered_files is None:
|
| uncovered_files = set()
|
| + if manually_specified_reviewers is None:
|
| + manually_specified_reviewers = []
|
|
|
| change = self.mox.CreateMock(presubmit.Change)
|
| change.issue = issue
|
| change.author_email = 'john@example.com'
|
| - change.R = ''
|
| + change.R = ','.join(manually_specified_reviewers)
|
| change.TBR = ''
|
| affected_file = self.mox.CreateMock(presubmit.SvnAffectedFile)
|
| input_api = self.MockInputApi(change, False)
|
| @@ -2614,7 +2617,6 @@ class CannedChecksUnittest(PresubmitTestsBase):
|
| people = approvers
|
| else:
|
| people = reviewers
|
| - change.R = ','.join(reviewers)
|
|
|
| if issue:
|
| input_api.rietveld.get_issue_properties(
|
| @@ -2729,10 +2731,24 @@ class CannedChecksUnittest(PresubmitTestsBase):
|
| def testCannedCheckOwners_NoIssueLocalReviewers(self):
|
| self.AssertOwnersWorks(issue=None,
|
| reviewers=set(['jane@example.com']),
|
| + manually_specified_reviewers=['jane@example.com'],
|
| expected_output="OWNERS check failed: this change has no Rietveld "
|
| "issue number, so we can't check it for approvals.\n")
|
| self.AssertOwnersWorks(issue=None,
|
| reviewers=set(['jane@example.com']),
|
| + manually_specified_reviewers=['jane@example.com'],
|
| + is_committing=False,
|
| + expected_output='')
|
| +
|
| + def testCannedCheckOwners_NoIssueLocalReviewersInferEmailDomain(self):
|
| + self.AssertOwnersWorks(issue=None,
|
| + reviewers=set(['jane']),
|
| + manually_specified_reviewers=['jane@example.com'],
|
| + expected_output="OWNERS check failed: this change has no Rietveld "
|
| + "issue number, so we can't check it for approvals.\n")
|
| + self.AssertOwnersWorks(issue=None,
|
| + reviewers=set(['jane@chromium.org']),
|
| + manually_specified_reviewers=['jane'],
|
| is_committing=False,
|
| expected_output='')
|
|
|
|
|