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

[IMP] runbot_merge: message when approving a PR in error

Browse Source 
I thought I'd removed the error message when approving an already
approved PR but apparently not?

However we can improve the message in that specific case, to make the
expected operation clearer.

Fixes #906
This commit is contained in:
Xavier Morel 2024-07-09 14:06:19 +02:00
parent b1d3278de1
commit 02013a53d9
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runbot_merge/models/pull_requests.py
View File

@ -1052,10 +1052,15 @@ For your own safety I've ignored *everything in your entire comment*.
if not newstate:
# Don't fail the entire command if someone tries to approve an
# already-approved PR.
if self.error:
msg = "This PR is already reviewed, it's in error, you might want to `retry` it instead " \
"(if you have already confirmed the error is not legitimate)."
else:
msg = "This PR is already reviewed, reviewing it again is useless."
self.env['runbot_merge.pull_requests.feedback'].create({
'repository': self.repository.id,
'pull_request': self.number,
'message': "This PR is already reviewed, reviewing it again is useless.",
'message': msg,
})
return None

49
runbot_merge/tests/test_basic.py
View File

@ -1199,33 +1199,41 @@ class TestRetry:
reviewer asks for it
"""
with repo:
prx = _simple_init(repo)
repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+ delegate=%s rebase-merge' % users['other'],
config["role_reviewer"]['token'])
pr = _simple_init(repo)
repo.post_status(pr.head, 'success', 'ci/runbot')
repo.post_status(pr.head, 'success', 'legal/cla')
pr.post_comment(f'hansen r+ delegate={users["other"]} rebase-merge',
config["role_reviewer"]['token'])
env.run_crons()
assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name),
('number', '=', prx.number)
]).staging_id
pr_id = to_pr(env, pr)
assert pr_id.staging_id
staging_head = repo.commit('heads/staging.master')
with repo:
repo.post_status('staging.master', 'success', 'legal/cla')
repo.post_status('staging.master', 'failure', 'ci/runbot')
env.run_crons()
assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name),
('number', '=', prx.number)
]).state == 'error'
assert pr_id.state == 'error'
with repo:
prx.post_comment('hansen retry', config['role_' + retrier]['token'])
assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name),
('number', '=', prx.number)
]).state == 'ready'
pr.post_comment('hansen r+ rebase-ff', config["role_reviewer"]['token'])
env.run_crons()
assert pr_id.state == 'error'
assert pr.comments == [
(users['reviewer'], f'hansen r+ delegate={users["other"]} rebase-merge'),
seen(env, pr, users),
(users['user'], 'Merge method set to rebase and merge, using the PR as merge commit message.'),
(users['user'], '@{user} @{reviewer} staging failed: ci/runbot'.format_map(users)),
(users['reviewer'], 'hansen r+ rebase-ff'),
(users['user'], "This PR is already reviewed, it's in error, you might want to `retry` it instead "
"(if you have already confirmed the error is not legitimate)."),
(users['user'], 'Merge method set to rebase and fast-forward.'),
]
assert pr_id.merge_method == 'rebase-ff'
with repo:
pr.post_comment('hansen retry', config['role_' + retrier]['token'])
assert pr_id.state == 'ready'
env.run_crons('runbot_merge.merge_cron', 'runbot_merge.staging_cron')
staging_head2 = repo.commit('heads/staging.master')
@ -1234,10 +1242,7 @@ class TestRetry:
repo.post_status('staging.master', 'success', 'legal/cla')
repo.post_status('staging.master', 'success', 'ci/runbot')
env.run_crons()
assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name),
('number', '=', prx.number)
]).state == 'merged'
assert pr_id.state == 'merged'
def test_retry_again_message(self, env, repo, users, config, page):
""" For a retried PR, the error message on the PR's page should be the