NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-30 23:05:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot_merge: warning on re-reviewing a reviewed PR

Browse Source
This commit is contained in:
Xavier Morel 2018-10-19 11:35:31 +02:00
parent 439e336a2f
commit 02dd03fca3
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot_merge/models/pull_requests.py
View File

@ -567,6 +567,8 @@ class PullRequests(models.Model):
if newstate: if newstate:
self.state = newstate self.state = newstate
ok = True ok = True
else:
msg = "This PR is already reviewed, reviewing it again is useless."
elif not param and is_author: elif not param and is_author:
newstate = RMINUS.get(self.state) newstate = RMINUS.get(self.state)
if newstate: if newstate:

5
runbot_merge/tests/test_basic.py
View File

@ -1683,12 +1683,17 @@ class TestReviewing(object):
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
]).state == 'ready' ]).state == 'ready'
# second r+ to check warning
prx.post_comment('hansen r+', user='reviewer')
env['runbot_merge.project']._send_feedback() env['runbot_merge.project']._send_feedback()
assert prx.comments == [ assert prx.comments == [
(users['other'], 'hansen r+'), (users['other'], 'hansen r+'),
(users['reviewer'], 'hansen r+'), (users['reviewer'], 'hansen r+'),
(users['reviewer'], 'hansen r+'),
(users['user'], "I'm sorry, @{}. I'm afraid I can't do that.".format(users['other'])), (users['user'], "I'm sorry, @{}. I'm afraid I can't do that.".format(users['other'])),
(users['user'], "I'm sorry, @{}. This PR is already reviewed, reviewing it again is useless.".format(
users['reviewer'])),
] ]
def test_self_review_fail(self, env, repo, users): def test_self_review_fail(self, env, repo, users):