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] forwardport: check fwbot approval for a conflicting PR

Browse Source 
A conflicting forward port should not be approvable via fwbot, it
should be merged like a novel PR (via the mergebot).
This commit is contained in:
Xavier Morel 2023-08-30 12:24:05 +02:00
parent 65ed7c51bc
commit 2c177c83f6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forwardport/tests/test_conflicts.py
View File

@ -93,6 +93,10 @@ In the former case, you may want to edit this PR message as well\.
More info at https://github\.com/odoo/odoo/wiki/Mergebot#forward-port More info at https://github\.com/odoo/odoo/wiki/Mergebot#forward-port
''', re.DOTALL)) ''', re.DOTALL))
] ]
with prod:
prc.post_comment(f'@{project.fp_github_name} r+', config['role_reviewer']['token'])
env.run_crons()
assert prc_id.state == 'opened', "approving via fw should not work on a conflict"
prb = prod.get_pr(prb_id.number) prb = prod.get_pr(prb_id.number)
assert prb.comments == [ assert prb.comments == [