NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] allow delegate reviewers to retry and r-

Browse Source
This commit is contained in:
Xavier Morel 2018-03-26 17:29:49 +02:00 committed by xmo-odoo
parent 781b679648
commit ea9203c359
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot_merge/models/pull_requests.py
View File

@ -396,9 +396,9 @@ class PullRequests(models.Model):
is_admin = (author.reviewer and self.author != author) or (author.self_reviewer and self.author == author) is_admin = (author.reviewer and self.author != author) or (author.self_reviewer and self.author == author)
is_reviewer = is_admin or self in author.delegate_reviewer is_reviewer = is_admin or self in author.delegate_reviewer
# TODO: should delegate reviewers be able to retry PRs? # TODO: should delegate reviewers be able to retry PRs?
is_author = is_admin or self.author == author is_author = is_reviewer or self.author == author
if not (is_author or is_reviewer or is_admin): if not is_author:
# no point even parsing commands # no point even parsing commands
_logger.info("ignoring comment of %s (%s): no ACL to %s:%s", _logger.info("ignoring comment of %s (%s): no ACL to %s:%s",
author.github_login, author.display_name, author.github_login, author.display_name,

12
runbot_merge/tests/test_basic.py
View File

@ -18,6 +18,10 @@ def repo(gh, env):
'github_login': 'self-reviewer', 'github_login': 'self-reviewer',
'self_reviewer': True, 'self_reviewer': True,
}) })
env['res.partner'].create({
'name': "Other",
'github_login': 'other',
})
env['runbot_merge.project'].create({ env['runbot_merge.project'].create({
'name': 'odoo', 'name': 'odoo',
'github_token': 'okokok', 'github_token': 'okokok',
@ -369,7 +373,7 @@ class TestRetry:
env['runbot_merge.project']._check_progress() env['runbot_merge.project']._check_progress()
assert pr.state == 'merged' assert pr.state == 'merged'
@pytest.mark.parametrize('retrier', ['user', 'reviewer']) @pytest.mark.parametrize('retrier', ['user', 'other', 'reviewer'])
def test_retry_comment(self, env, repo, retrier): def test_retry_comment(self, env, repo, retrier):
""" An accepted but failed PR should be re-tried when the author or a """ An accepted but failed PR should be re-tried when the author or a
reviewer asks for it reviewer asks for it
@ -382,7 +386,7 @@ class TestRetry:
prx = repo.make_pr('title', 'body', target='master', ctid=c2, user='user') prx = repo.make_pr('title', 'body', target='master', ctid=c2, user='user')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+ delegate=other', "reviewer")
env['runbot_merge.project']._check_progress() env['runbot_merge.project']._check_progress()
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', 'odoo/odoo'), ('repository.name', '=', 'odoo/odoo'),
@ -415,7 +419,7 @@ class TestRetry:
('number', '=', prx.number) ('number', '=', prx.number)
]).state == 'merged' ]).state == 'merged'
@pytest.mark.parametrize('disabler', ['user', 'reviewer']) @pytest.mark.parametrize('disabler', ['user', 'other', 'reviewer'])
def test_retry_disable(self, env, repo, disabler): def test_retry_disable(self, env, repo, disabler):
m = repo.make_commit(None, 'initial', None, tree={'m': 'm'}) m = repo.make_commit(None, 'initial', None, tree={'m': 'm'})
repo.make_ref('heads/master', m) repo.make_ref('heads/master', m)
@ -425,7 +429,7 @@ class TestRetry:
prx = repo.make_pr('title', 'body', target='master', ctid=c2, user='user') prx = repo.make_pr('title', 'body', target='master', ctid=c2, user='user')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+ delegate=other', "reviewer")
env['runbot_merge.project']._check_progress() env['runbot_merge.project']._check_progress()
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', 'odoo/odoo'), ('repository.name', '=', 'odoo/odoo'),