From 2c177c83f6d49254f3bc07b9e69dcfb820c3ebdf Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 30 Aug 2023 12:24:05 +0200 Subject: [PATCH] [IMP] forwardport: check fwbot approval for a conflicting PR A conflicting forward port should not be approvable via fwbot, it should be merged like a novel PR (via the mergebot). --- forwardport/tests/test_conflicts.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forwardport/tests/test_conflicts.py b/forwardport/tests/test_conflicts.py index 1d29df2d..eeeaf7ea 100644 --- a/forwardport/tests/test_conflicts.py +++ b/forwardport/tests/test_conflicts.py @@ -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 ''', 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) assert prb.comments == [