runbot/forwardport/tests
Xavier Morel 2742fe18fd [FIX] forwardport: correct batching of intermediate PRs
When inserting a new branch, if there are extant forward ports
sequences spanning over the insertion, new forward ports must be
created for the new branch.

This was the case, *however* one of the cases was handled incorrectly:
PR batches (PRs to different repositories staged together) must be
forward-ported as batches. However when creating the "insert" batches,
these PRs would be split apart, leading to either inconsistent states
or an inability to merge the new forward ports (if they are
co-dependent which is a common case). This is because the handler
would look for all the relevant PRs to forward ports, but it would
fail to group them by label thereafter.

Fix that, create the `insert` batches correctly, and augment the
relevant test with an additional repository to test this case.

No gh issue was created, but this problem was reported on
odoo/odoo#110029 and odoo/enterprise#35838 (they were re-linked by
hand in the runbot and mergebot, but on github the labels remain
visibly different, one having the slug ZCwE while the other
hasO7Pr).

It's possible that the problem had occurred previously and not been
noticed (or reported), though it's also possible this issue had never
occurred before: for the latest freeze (16.1) there were 18 forward
ports spanning the insertion, but of them only 2 were the same batch.
2023-01-19 10:57:09 +01:00
..
conftest.py [IMP] *: store filestore & forwardport checkouts in temp dirs 2022-08-05 15:35:51 +02:00
test_batches.py [CHG] runbot_merge, forwardport: remove labelling 2020-11-20 07:41:54 +01:00
test_conflicts.py [REM] forwardport: fp_sequence field 2022-12-08 10:46:22 +01:00
test_limit.py [IMP] *: review mergebot & forwardbot messages for pinging 2022-06-30 15:07:49 +02:00
test_overrides.py [IMP] forwardport: unmodified fw automatically inherit overrides 2021-01-13 16:11:14 +01:00
test_simple.py [REM] forwardport: fp_sequence field 2022-12-08 10:46:22 +01:00
test_updates.py [REM] forwardport: fp_sequence field 2022-12-08 10:46:22 +01:00
test_weird.py [FIX] forwardport: correct batching of intermediate PRs 2023-01-19 10:57:09 +01:00