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] runbot_merge: further validation of squash update on retargeting

Browse Source 
It should have already been working, added an additional check for
update-then-retarget just in case but that worked out of the box. So
not sure why odoo/odoo#40106 failed.

Closes #256
This commit is contained in:
Xavier Morel 2019-11-18 14:21:16 +01:00
parent 8a47c57c3d
commit b853e5ba96
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runbot_merge/tests/test_basic.py
View File

@ -677,11 +677,11 @@ class TestPREdition:
master = env['runbot_merge.branch'].search([('name', '=', 'master')]) master = env['runbot_merge.branch'].search([('name', '=', 'master')])
with repo: with repo:
# master is 1 commit in advance of 1.0 # master is 1 commit ahead of 1.0
m = repo.make_commit(None, 'initial', None, tree={'m': 'm'}) m = repo.make_commit(None, 'initial', None, tree={'m': 'm'})
repo.make_ref('heads/1.0', m)
m2 = repo.make_commit(m, 'second', None, tree={'m': 'm2'}) m2 = repo.make_commit(m, 'second', None, tree={'m': 'm2'})
repo.make_ref('heads/master', m2) repo.make_ref('heads/master', m2)
repo.make_ref('heads/1.0', m)
# the PR builds on master, but is errorneously targeted to 1.0 # the PR builds on master, but is errorneously targeted to 1.0
c = repo.make_commit(m2, 'first', None, tree={'m': 'm3'}) c = repo.make_commit(m2, 'first', None, tree={'m': 'm3'})
@ -702,6 +702,17 @@ class TestPREdition:
assert pr.target == branch_1 assert pr.target == branch_1
assert not pr.squash assert not pr.squash
# check if things also work right when modifying the PR then
# retargeting (don't see why not but...)
with repo:
c2 = repo.make_commit(m2, 'xxx', None, tree={'m': 'm4'})
repo.update_ref(prx.ref, c2, force=True)
assert pr.head == c2
assert not pr.squash
with repo:
prx.base = 'master'
assert pr.squash
def test_retarget_from_disabled(self, env, repo): def test_retarget_from_disabled(self, env, repo):
""" Retargeting a PR from a disabled branch should not duplicate the PR """ Retargeting a PR from a disabled branch should not duplicate the PR
""" """