From 02dd03fca32a70b339cc9dca7194ebc0a78f5a4b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 19 Oct 2018 11:35:31 +0200 Subject: [PATCH] [IMP] runbot_merge: warning on re-reviewing a reviewed PR --- runbot_merge/models/pull_requests.py | 2 ++ runbot_merge/tests/test_basic.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 54755b10..9c012089 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -567,6 +567,8 @@ class PullRequests(models.Model): if newstate: self.state = newstate ok = True + else: + msg = "This PR is already reviewed, reviewing it again is useless." elif not param and is_author: newstate = RMINUS.get(self.state) if newstate: diff --git a/runbot_merge/tests/test_basic.py b/runbot_merge/tests/test_basic.py index 10a32f7d..3ffdf23d 100644 --- a/runbot_merge/tests/test_basic.py +++ b/runbot_merge/tests/test_basic.py @@ -1683,12 +1683,17 @@ class TestReviewing(object): ('repository.name', '=', repo.name), ('number', '=', prx.number) ]).state == 'ready' + # second r+ to check warning + prx.post_comment('hansen r+', user='reviewer') env['runbot_merge.project']._send_feedback() assert prx.comments == [ (users['other'], '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, @{}. This PR is already reviewed, reviewing it again is useless.".format( + users['reviewer'])), ] def test_self_review_fail(self, env, repo, users):