mirror of
https://github.com/odoo/runbot.git
synced 2025-03-27 13:25:47 +07:00
[REF] forwardport: move PR update tests to their own module
This commit is contained in:
Xavier Morel
parent
ab919c00db
commit
5e05d3cd96
@ -233,262 +233,6 @@ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
|
|||||||
with pytest.raises(AssertionError, match="Not Found"):
|
with pytest.raises(AssertionError, match="Not Found"):
|
||||||
other.get_ref(pr2_ref)
|
other.get_ref(pr2_ref)
|
||||||
|
|
||||||
def test_update_pr(env, config, make_repo, users):
|
|
||||||
""" Even for successful cherrypicks, it's possible that e.g. CI doesn't
|
|
||||||
pass or the reviewer finds out they need to update the code.
|
|
||||||
|
|
||||||
In this case, all following forward ports should... be detached? Or maybe
|
|
||||||
only this one and its dependent should be updated?
|
|
||||||
"""
|
|
||||||
prod, other = make_basic(env, config, make_repo)
|
|
||||||
with prod:
|
|
||||||
[p_1] = prod.make_commits(
|
|
||||||
'a',
|
|
||||||
Commit('p_0', tree={'x': '0'}),
|
|
||||||
ref='heads/hugechange'
|
|
||||||
)
|
|
||||||
pr = prod.make_pr(target='a', head='hugechange')
|
|
||||||
prod.post_status(p_1, 'success', 'legal/cla')
|
|
||||||
prod.post_status(p_1, 'success', 'ci/runbot')
|
|
||||||
pr.post_comment('hansen r+', config['role_reviewer']['token'])
|
|
||||||
|
|
||||||
env.run_crons()
|
|
||||||
with prod:
|
|
||||||
prod.post_status('staging.a', 'success', 'legal/cla')
|
|
||||||
prod.post_status('staging.a', 'success', 'ci/runbot')
|
|
||||||
|
|
||||||
# should merge the staging then create the FP PR
|
|
||||||
env.run_crons()
|
|
||||||
|
|
||||||
pr0_id, pr1_id = env['runbot_merge.pull_requests'].search([], order='number')
|
|
||||||
|
|
||||||
fp_intermediate = (users['user'], '''\
|
|
||||||
This PR targets b and is part of the forward-port chain. Further PRs will be created up to c.
|
|
||||||
|
|
||||||
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
|
|
||||||
''')
|
|
||||||
ci_warning = (users['user'], 'Ping @%(user)s, @%(reviewer)s\n\nci/runbot failed on this forward-port PR' % users)
|
|
||||||
|
|
||||||
# oh no CI of the first FP PR failed!
|
|
||||||
# simulate status being sent multiple times (e.g. on multiple repos) with
|
|
||||||
# some delivery lag allowing for the cron to run between each delivery
|
|
||||||
for st, ctx in [('failure', 'ci/runbot'), ('failure', 'ci/runbot'), ('success', 'legal/cla'), ('success', 'legal/cla')]:
|
|
||||||
with prod:
|
|
||||||
prod.post_status(pr1_id.head, st, ctx)
|
|
||||||
env.run_crons()
|
|
||||||
with prod: # should be ignored because the description doesn't matter
|
|
||||||
prod.post_status(pr1_id.head, 'failure', 'ci/runbot', description="HAHAHAHAHA")
|
|
||||||
env.run_crons()
|
|
||||||
# check that FP did not resume & we have a ping on the PR
|
|
||||||
assert env['runbot_merge.pull_requests'].search([], order='number') == pr0_id | pr1_id,\
|
|
||||||
"forward port should not continue on CI failure"
|
|
||||||
pr1_remote = prod.get_pr(pr1_id.number)
|
|
||||||
assert pr1_remote.comments == [seen(env, pr1_remote, users), fp_intermediate, ci_warning]
|
|
||||||
|
|
||||||
# it was a false positive, rebuild... it fails again!
|
|
||||||
with prod:
|
|
||||||
prod.post_status(pr1_id.head, 'failure', 'ci/runbot', target_url='http://example.org/4567890')
|
|
||||||
env.run_crons()
|
|
||||||
# check that FP did not resume & we have a ping on the PR
|
|
||||||
assert env['runbot_merge.pull_requests'].search([], order='number') == pr0_id | pr1_id,\
|
|
||||||
"ensure it still hasn't restarted"
|
|
||||||
assert pr1_remote.comments == [seen(env, pr1_remote, users), fp_intermediate, ci_warning, ci_warning]
|
|
||||||
|
|
||||||
# nb: updating the head would detach the PR and not put it in the warning
|
|
||||||
# path anymore
|
|
||||||
|
|
||||||
# rebuild again, finally passes
|
|
||||||
with prod:
|
|
||||||
prod.post_status(pr1_id.head, 'success', 'ci/runbot')
|
|
||||||
env.run_crons()
|
|
||||||
|
|
||||||
pr0_id, pr1_id, pr2_id = env['runbot_merge.pull_requests'].search([], order='number')
|
|
||||||
assert pr1_id.parent_id == pr0_id
|
|
||||||
assert pr2_id.parent_id == pr1_id
|
|
||||||
pr1_head = pr1_id.head
|
|
||||||
pr2_head = pr2_id.head
|
|
||||||
|
|
||||||
# turns out branch b is syntactically but not semantically compatible! It
|
|
||||||
# needs x to be 5!
|
|
||||||
pr_repo, pr_ref = prod.get_pr(pr1_id.number).branch
|
|
||||||
with pr_repo:
|
|
||||||
# force-push correct commit to PR's branch
|
|
||||||
[new_c] = pr_repo.make_commits(
|
|
||||||
pr1_id.target.name,
|
|
||||||
Commit('whop whop', tree={'x': '5'}),
|
|
||||||
ref='heads/%s' % pr_ref,
|
|
||||||
make=False
|
|
||||||
)
|
|
||||||
env.run_crons()
|
|
||||||
|
|
||||||
assert pr1_id.head == new_c != pr1_head, "the FP PR should be updated"
|
|
||||||
assert not pr1_id.parent_id, "the FP PR should be detached from the original"
|
|
||||||
assert pr1_remote.comments == [
|
|
||||||
seen(env, pr1_remote, users),
|
|
||||||
fp_intermediate, ci_warning, ci_warning,
|
|
||||||
(users['user'], "This PR was modified / updated and has become a normal PR. It should be merged the normal way (via @%s)" % pr1_id.repository.project_id.github_prefix),
|
|
||||||
], "users should be warned that the PR has become non-FP"
|
|
||||||
# NOTE: should the followup PR wait for pr1 CI or not?
|
|
||||||
assert pr2_id.head != pr2_head
|
|
||||||
assert pr2_id.parent_id == pr1_id, "the followup PR should still be linked"
|
|
||||||
|
|
||||||
assert prod.read_tree(prod.commit(pr1_id.head)) == {
|
|
||||||
'f': 'c',
|
|
||||||
'g': 'b',
|
|
||||||
'x': '5'
|
|
||||||
}, "the FP PR should have the new code"
|
|
||||||
assert prod.read_tree(prod.commit(pr2_id.head)) == {
|
|
||||||
'f': 'c',
|
|
||||||
'g': 'a',
|
|
||||||
'h': 'a',
|
|
||||||
'x': '5'
|
|
||||||
}, "the followup FP should also have the update"
|
|
||||||
|
|
||||||
with pr_repo:
|
|
||||||
pr_repo.make_commits(
|
|
||||||
pr1_id.target.name,
|
|
||||||
Commit('fire!', tree={'h': '0'}),
|
|
||||||
ref='heads/%s' % pr_ref,
|
|
||||||
)
|
|
||||||
env.run_crons()
|
|
||||||
# since there are PRs, this is going to update pr2 as broken
|
|
||||||
assert prod.read_tree(prod.commit(pr1_id.head)) == {
|
|
||||||
'f': 'c',
|
|
||||||
'g': 'b',
|
|
||||||
'h': '0'
|
|
||||||
}
|
|
||||||
assert prod.read_tree(prod.commit(pr2_id.head)) == {
|
|
||||||
'f': 'c',
|
|
||||||
'g': 'a',
|
|
||||||
'h': re_matches(r'''<<<\x3c<<< HEAD
|
|
||||||
a
|
|
||||||
=======
|
|
||||||
0
|
|
||||||
>>>\x3e>>> [0-9a-f]{7,}.*
|
|
||||||
'''),
|
|
||||||
}
|
|
||||||
[project] = env['runbot_merge.project'].search([])
|
|
||||||
pr2 = prod.get_pr(pr2_id.number)
|
|
||||||
# fail pr2 then fwbot r+ to check that we get a warning
|
|
||||||
with prod:
|
|
||||||
prod.post_status(pr2_id.head, 'failure', 'ci/runbot')
|
|
||||||
env.run_crons() # parse commit statuses
|
|
||||||
with prod:
|
|
||||||
pr2.post_comment(project.fp_github_name + ' r+', config['role_reviewer']['token'])
|
|
||||||
env.run_crons() # send feedback
|
|
||||||
|
|
||||||
assert pr2.comments == [
|
|
||||||
seen(env, pr2, users),
|
|
||||||
(users['user'], """Ping @{}, @{}
|
|
||||||
This PR targets c and is the last of the forward-port chain containing:
|
|
||||||
* {}
|
|
||||||
|
|
||||||
To merge the full chain, say
|
|
||||||
> @{} r+
|
|
||||||
|
|
||||||
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
|
|
||||||
""".format(users['user'], users['reviewer'], pr1_id.display_name, project.fp_github_name)),
|
|
||||||
(users['user'], 'Ping @{}, @{}\n\nci/runbot failed on this forward-port PR'.format(
|
|
||||||
users['user'], users['reviewer']
|
|
||||||
)),
|
|
||||||
(users['reviewer'], project.fp_github_name + ' r+'),
|
|
||||||
(users['user'], '@{}, you may want to rebuild or fix this PR as it has failed CI.'.format(users['reviewer'])),
|
|
||||||
]
|
|
||||||
|
|
||||||
def test_update_merged(env, make_repo, config, users):
|
|
||||||
""" Strange things happen when an FP gets closed / merged but then its
|
|
||||||
parent is modified and the forwardport tries to update the (now merged)
|
|
||||||
child.
|
|
||||||
|
|
||||||
Turns out the issue is the followup: given a PR a and forward port targets
|
|
||||||
B -> C -> D. When a is merged we get b, c and d. If c gets merged *then*
|
|
||||||
b gets updated, the fwbot will update c in turn, then it will look for the
|
|
||||||
head of the updated c in order to create d.
|
|
||||||
|
|
||||||
However it *will not* find that head, as update events don't get propagated
|
|
||||||
on closed PRs (this is generally a good thing). As a result, the sanity
|
|
||||||
check when trying to port c to d will fail.
|
|
||||||
|
|
||||||
After checking with nim, the safest behaviour seems to be:
|
|
||||||
|
|
||||||
* stop at the update of the first closed or merged PR
|
|
||||||
* signal on that PR that something fucky happened
|
|
||||||
* also maybe disable or exponentially backoff the update job after some
|
|
||||||
number of attempts?
|
|
||||||
"""
|
|
||||||
prod, other = make_basic(env, config, make_repo)
|
|
||||||
# add a 4th branch
|
|
||||||
with prod:
|
|
||||||
prod.make_ref('heads/d', prod.commit('c').id)
|
|
||||||
env['runbot_merge.project'].search([]).write({
|
|
||||||
'branch_ids': [(0, 0, {
|
|
||||||
'name': 'd', 'fp_sequence': -1, 'fp_target': True,
|
|
||||||
})]
|
|
||||||
})
|
|
||||||
|
|
||||||
with prod:
|
|
||||||
[c] = prod.make_commits('a', Commit('p_0', tree={'0': '0'}), ref='heads/hugechange')
|
|
||||||
pr = prod.make_pr(target='a', head='hugechange')
|
|
||||||
prod.post_status(c, 'success', 'legal/cla')
|
|
||||||
prod.post_status(c, 'success', 'ci/runbot')
|
|
||||||
pr.post_comment('hansen r+', config['role_reviewer']['token'])
|
|
||||||
env.run_crons()
|
|
||||||
with prod:
|
|
||||||
prod.post_status('staging.a', 'success', 'legal/cla')
|
|
||||||
prod.post_status('staging.a', 'success', 'ci/runbot')
|
|
||||||
env.run_crons()
|
|
||||||
|
|
||||||
pr0_id, pr1_id = env['runbot_merge.pull_requests'].search([], order='number')
|
|
||||||
with prod:
|
|
||||||
prod.post_status(pr1_id.head, 'success', 'legal/cla')
|
|
||||||
prod.post_status(pr1_id.head, 'success', 'ci/runbot')
|
|
||||||
env.run_crons()
|
|
||||||
|
|
||||||
pr0_id, pr1_id, pr2_id = env['runbot_merge.pull_requests'].search([], order='number')
|
|
||||||
pr2 = prod.get_pr(pr2_id.number)
|
|
||||||
with prod:
|
|
||||||
pr2.post_comment('hansen r+', config['role_reviewer']['token'])
|
|
||||||
prod.post_status(pr2_id.head, 'success', 'legal/cla')
|
|
||||||
prod.post_status(pr2_id.head, 'success', 'ci/runbot')
|
|
||||||
env.run_crons()
|
|
||||||
|
|
||||||
assert pr2_id.staging_id
|
|
||||||
with prod:
|
|
||||||
prod.post_status('staging.c', 'success', 'legal/cla')
|
|
||||||
prod.post_status('staging.c', 'success', 'ci/runbot')
|
|
||||||
env.run_crons()
|
|
||||||
assert pr2_id.state == 'merged'
|
|
||||||
assert pr2.state == 'closed'
|
|
||||||
|
|
||||||
# now we can try updating pr1 and see what happens
|
|
||||||
repo, ref = prod.get_pr(pr1_id.number).branch
|
|
||||||
with repo:
|
|
||||||
repo.make_commits(
|
|
||||||
pr1_id.target.name,
|
|
||||||
Commit('2', tree={'0': '0', '1': '1'}),
|
|
||||||
ref='heads/%s' % ref,
|
|
||||||
make=False
|
|
||||||
)
|
|
||||||
updates = env['forwardport.updates'].search([])
|
|
||||||
assert updates
|
|
||||||
assert updates.original_root == pr0_id
|
|
||||||
assert updates.new_root == pr1_id
|
|
||||||
env.run_crons()
|
|
||||||
assert not pr1_id.parent_id
|
|
||||||
assert not env['forwardport.updates'].search([])
|
|
||||||
|
|
||||||
assert pr2.comments == [
|
|
||||||
seen(env, pr2, users),
|
|
||||||
(users['user'], '''This PR targets c and is part of the forward-port chain. Further PRs will be created up to d.
|
|
||||||
|
|
||||||
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
|
|
||||||
'''),
|
|
||||||
(users['reviewer'], 'hansen r+'),
|
|
||||||
(users['user'], """Ancestor PR %s has been updated but this PR is merged and can't be updated to match.
|
|
||||||
|
|
||||||
You may want or need to manually update any followup PR.""" % pr1_id.display_name)
|
|
||||||
]
|
|
||||||
|
|
||||||
def test_conflict(env, config, make_repo, users):
|
def test_conflict(env, config, make_repo, users):
|
||||||
""" Create a PR to A which will (eventually) conflict with C when
|
""" Create a PR to A which will (eventually) conflict with C when
|
||||||
forward-ported.
|
forward-ported.
|
||||||
|
|||||||
262
forwardport/tests/test_updates.py
Normal file
262
forwardport/tests/test_updates.py
Normal file
@ -0,0 +1,262 @@
|
|||||||
|
"""
|
||||||
|
Test cases for updating PRs during after the forward-porting process after the
|
||||||
|
initial merge has succeeded (and forward-porting has started)
|
||||||
|
"""
|
||||||
|
|
||||||
|
from utils import seen, re_matches, Commit, make_basic
|
||||||
|
|
||||||
|
def test_update_pr(env, config, make_repo, users):
|
||||||
|
""" Even for successful cherrypicks, it's possible that e.g. CI doesn't
|
||||||
|
pass or the reviewer finds out they need to update the code.
|
||||||
|
|
||||||
|
In this case, all following forward ports should... be detached? Or maybe
|
||||||
|
only this one and its dependent should be updated?
|
||||||
|
"""
|
||||||
|
prod, _ = make_basic(env, config, make_repo)
|
||||||
|
with prod:
|
||||||
|
[p_1] = prod.make_commits(
|
||||||
|
'a',
|
||||||
|
Commit('p_0', tree={'x': '0'}),
|
||||||
|
ref='heads/hugechange'
|
||||||
|
)
|
||||||
|
pr = prod.make_pr(target='a', head='hugechange')
|
||||||
|
prod.post_status(p_1, 'success', 'legal/cla')
|
||||||
|
prod.post_status(p_1, 'success', 'ci/runbot')
|
||||||
|
pr.post_comment('hansen r+', config['role_reviewer']['token'])
|
||||||
|
|
||||||
|
env.run_crons()
|
||||||
|
with prod:
|
||||||
|
prod.post_status('staging.a', 'success', 'legal/cla')
|
||||||
|
prod.post_status('staging.a', 'success', 'ci/runbot')
|
||||||
|
|
||||||
|
# should merge the staging then create the FP PR
|
||||||
|
env.run_crons()
|
||||||
|
|
||||||
|
pr0_id, pr1_id = env['runbot_merge.pull_requests'].search([], order='number')
|
||||||
|
|
||||||
|
fp_intermediate = (users['user'], '''\
|
||||||
|
This PR targets b and is part of the forward-port chain. Further PRs will be created up to c.
|
||||||
|
|
||||||
|
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
|
||||||
|
''')
|
||||||
|
ci_warning = (users['user'], 'Ping @%(user)s, @%(reviewer)s\n\nci/runbot failed on this forward-port PR' % users)
|
||||||
|
|
||||||
|
# oh no CI of the first FP PR failed!
|
||||||
|
# simulate status being sent multiple times (e.g. on multiple repos) with
|
||||||
|
# some delivery lag allowing for the cron to run between each delivery
|
||||||
|
for st, ctx in [('failure', 'ci/runbot'), ('failure', 'ci/runbot'), ('success', 'legal/cla'), ('success', 'legal/cla')]:
|
||||||
|
with prod:
|
||||||
|
prod.post_status(pr1_id.head, st, ctx)
|
||||||
|
env.run_crons()
|
||||||
|
with prod: # should be ignored because the description doesn't matter
|
||||||
|
prod.post_status(pr1_id.head, 'failure', 'ci/runbot', description="HAHAHAHAHA")
|
||||||
|
env.run_crons()
|
||||||
|
# check that FP did not resume & we have a ping on the PR
|
||||||
|
assert env['runbot_merge.pull_requests'].search([], order='number') == pr0_id | pr1_id,\
|
||||||
|
"forward port should not continue on CI failure"
|
||||||
|
pr1_remote = prod.get_pr(pr1_id.number)
|
||||||
|
assert pr1_remote.comments == [seen(env, pr1_remote, users), fp_intermediate, ci_warning]
|
||||||
|
|
||||||
|
# it was a false positive, rebuild... it fails again!
|
||||||
|
with prod:
|
||||||
|
prod.post_status(pr1_id.head, 'failure', 'ci/runbot', target_url='http://example.org/4567890')
|
||||||
|
env.run_crons()
|
||||||
|
# check that FP did not resume & we have a ping on the PR
|
||||||
|
assert env['runbot_merge.pull_requests'].search([], order='number') == pr0_id | pr1_id,\
|
||||||
|
"ensure it still hasn't restarted"
|
||||||
|
assert pr1_remote.comments == [seen(env, pr1_remote, users), fp_intermediate, ci_warning, ci_warning]
|
||||||
|
|
||||||
|
# nb: updating the head would detach the PR and not put it in the warning
|
||||||
|
# path anymore
|
||||||
|
|
||||||
|
# rebuild again, finally passes
|
||||||
|
with prod:
|
||||||
|
prod.post_status(pr1_id.head, 'success', 'ci/runbot')
|
||||||
|
env.run_crons()
|
||||||
|
|
||||||
|
pr0_id, pr1_id, pr2_id = env['runbot_merge.pull_requests'].search([], order='number')
|
||||||
|
assert pr1_id.parent_id == pr0_id
|
||||||
|
assert pr2_id.parent_id == pr1_id
|
||||||
|
pr1_head = pr1_id.head
|
||||||
|
pr2_head = pr2_id.head
|
||||||
|
|
||||||
|
# turns out branch b is syntactically but not semantically compatible! It
|
||||||
|
# needs x to be 5!
|
||||||
|
pr_repo, pr_ref = prod.get_pr(pr1_id.number).branch
|
||||||
|
with pr_repo:
|
||||||
|
# force-push correct commit to PR's branch
|
||||||
|
[new_c] = pr_repo.make_commits(
|
||||||
|
pr1_id.target.name,
|
||||||
|
Commit('whop whop', tree={'x': '5'}),
|
||||||
|
ref='heads/%s' % pr_ref,
|
||||||
|
make=False
|
||||||
|
)
|
||||||
|
env.run_crons()
|
||||||
|
|
||||||
|
assert pr1_id.head == new_c != pr1_head, "the FP PR should be updated"
|
||||||
|
assert not pr1_id.parent_id, "the FP PR should be detached from the original"
|
||||||
|
assert pr1_remote.comments == [
|
||||||
|
seen(env, pr1_remote, users),
|
||||||
|
fp_intermediate, ci_warning, ci_warning,
|
||||||
|
(users['user'], "This PR was modified / updated and has become a normal PR. It should be merged the normal way (via @%s)" % pr1_id.repository.project_id.github_prefix),
|
||||||
|
], "users should be warned that the PR has become non-FP"
|
||||||
|
# NOTE: should the followup PR wait for pr1 CI or not?
|
||||||
|
assert pr2_id.head != pr2_head
|
||||||
|
assert pr2_id.parent_id == pr1_id, "the followup PR should still be linked"
|
||||||
|
|
||||||
|
assert prod.read_tree(prod.commit(pr1_id.head)) == {
|
||||||
|
'f': 'c',
|
||||||
|
'g': 'b',
|
||||||
|
'x': '5'
|
||||||
|
}, "the FP PR should have the new code"
|
||||||
|
assert prod.read_tree(prod.commit(pr2_id.head)) == {
|
||||||
|
'f': 'c',
|
||||||
|
'g': 'a',
|
||||||
|
'h': 'a',
|
||||||
|
'x': '5'
|
||||||
|
}, "the followup FP should also have the update"
|
||||||
|
|
||||||
|
with pr_repo:
|
||||||
|
pr_repo.make_commits(
|
||||||
|
pr1_id.target.name,
|
||||||
|
Commit('fire!', tree={'h': '0'}),
|
||||||
|
ref='heads/%s' % pr_ref,
|
||||||
|
)
|
||||||
|
env.run_crons()
|
||||||
|
# since there are PRs, this is going to update pr2 as broken
|
||||||
|
assert prod.read_tree(prod.commit(pr1_id.head)) == {
|
||||||
|
'f': 'c',
|
||||||
|
'g': 'b',
|
||||||
|
'h': '0'
|
||||||
|
}
|
||||||
|
assert prod.read_tree(prod.commit(pr2_id.head)) == {
|
||||||
|
'f': 'c',
|
||||||
|
'g': 'a',
|
||||||
|
'h': re_matches(r'''<<<\x3c<<< HEAD
|
||||||
|
a
|
||||||
|
=======
|
||||||
|
0
|
||||||
|
>>>\x3e>>> [0-9a-f]{7,}.*
|
||||||
|
'''),
|
||||||
|
}
|
||||||
|
[project] = env['runbot_merge.project'].search([])
|
||||||
|
pr2 = prod.get_pr(pr2_id.number)
|
||||||
|
# fail pr2 then fwbot r+ to check that we get a warning
|
||||||
|
with prod:
|
||||||
|
prod.post_status(pr2_id.head, 'failure', 'ci/runbot')
|
||||||
|
env.run_crons() # parse commit statuses
|
||||||
|
with prod:
|
||||||
|
pr2.post_comment(project.fp_github_name + ' r+', config['role_reviewer']['token'])
|
||||||
|
env.run_crons() # send feedback
|
||||||
|
|
||||||
|
assert pr2.comments == [
|
||||||
|
seen(env, pr2, users),
|
||||||
|
(users['user'], """Ping @{}, @{}
|
||||||
|
This PR targets c and is the last of the forward-port chain containing:
|
||||||
|
* {}
|
||||||
|
|
||||||
|
To merge the full chain, say
|
||||||
|
> @{} r+
|
||||||
|
|
||||||
|
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
|
||||||
|
""".format(users['user'], users['reviewer'], pr1_id.display_name, project.fp_github_name)),
|
||||||
|
(users['user'], 'Ping @{}, @{}\n\nci/runbot failed on this forward-port PR'.format(
|
||||||
|
users['user'], users['reviewer']
|
||||||
|
)),
|
||||||
|
(users['reviewer'], project.fp_github_name + ' r+'),
|
||||||
|
(users['user'], '@{}, you may want to rebuild or fix this PR as it has failed CI.'.format(users['reviewer'])),
|
||||||
|
]
|
||||||
|
|
||||||
|
def test_update_merged(env, make_repo, config, users):
|
||||||
|
""" Strange things happen when an FP gets closed / merged but then its
|
||||||
|
parent is modified and the forwardport tries to update the (now merged)
|
||||||
|
child.
|
||||||
|
|
||||||
|
Turns out the issue is the followup: given a PR a and forward port targets
|
||||||
|
B -> C -> D. When a is merged we get b, c and d. If c gets merged *then*
|
||||||
|
b gets updated, the fwbot will update c in turn, then it will look for the
|
||||||
|
head of the updated c in order to create d.
|
||||||
|
|
||||||
|
However it *will not* find that head, as update events don't get propagated
|
||||||
|
on closed PRs (this is generally a good thing). As a result, the sanity
|
||||||
|
check when trying to port c to d will fail.
|
||||||
|
|
||||||
|
After checking with nim, the safest behaviour seems to be:
|
||||||
|
|
||||||
|
* stop at the update of the first closed or merged PR
|
||||||
|
* signal on that PR that something fucky happened
|
||||||
|
* also maybe disable or exponentially backoff the update job after some
|
||||||
|
number of attempts?
|
||||||
|
"""
|
||||||
|
prod, _ = make_basic(env, config, make_repo)
|
||||||
|
# add a 4th branch
|
||||||
|
with prod:
|
||||||
|
prod.make_ref('heads/d', prod.commit('c').id)
|
||||||
|
env['runbot_merge.project'].search([]).write({
|
||||||
|
'branch_ids': [(0, 0, {
|
||||||
|
'name': 'd', 'fp_sequence': -1, 'fp_target': True,
|
||||||
|
})]
|
||||||
|
})
|
||||||
|
|
||||||
|
with prod:
|
||||||
|
[c] = prod.make_commits('a', Commit('p_0', tree={'0': '0'}), ref='heads/hugechange')
|
||||||
|
pr = prod.make_pr(target='a', head='hugechange')
|
||||||
|
prod.post_status(c, 'success', 'legal/cla')
|
||||||
|
prod.post_status(c, 'success', 'ci/runbot')
|
||||||
|
pr.post_comment('hansen r+', config['role_reviewer']['token'])
|
||||||
|
env.run_crons()
|
||||||
|
with prod:
|
||||||
|
prod.post_status('staging.a', 'success', 'legal/cla')
|
||||||
|
prod.post_status('staging.a', 'success', 'ci/runbot')
|
||||||
|
env.run_crons()
|
||||||
|
|
||||||
|
_, pr1_id = env['runbot_merge.pull_requests'].search([], order='number')
|
||||||
|
with prod:
|
||||||
|
prod.post_status(pr1_id.head, 'success', 'legal/cla')
|
||||||
|
prod.post_status(pr1_id.head, 'success', 'ci/runbot')
|
||||||
|
env.run_crons()
|
||||||
|
|
||||||
|
pr0_id, pr1_id, pr2_id = env['runbot_merge.pull_requests'].search([], order='number')
|
||||||
|
pr2 = prod.get_pr(pr2_id.number)
|
||||||
|
with prod:
|
||||||
|
pr2.post_comment('hansen r+', config['role_reviewer']['token'])
|
||||||
|
prod.post_status(pr2_id.head, 'success', 'legal/cla')
|
||||||
|
prod.post_status(pr2_id.head, 'success', 'ci/runbot')
|
||||||
|
env.run_crons()
|
||||||
|
|
||||||
|
assert pr2_id.staging_id
|
||||||
|
with prod:
|
||||||
|
prod.post_status('staging.c', 'success', 'legal/cla')
|
||||||
|
prod.post_status('staging.c', 'success', 'ci/runbot')
|
||||||
|
env.run_crons()
|
||||||
|
assert pr2_id.state == 'merged'
|
||||||
|
assert pr2.state == 'closed'
|
||||||
|
|
||||||
|
# now we can try updating pr1 and see what happens
|
||||||
|
repo, ref = prod.get_pr(pr1_id.number).branch
|
||||||
|
with repo:
|
||||||
|
repo.make_commits(
|
||||||
|
pr1_id.target.name,
|
||||||
|
Commit('2', tree={'0': '0', '1': '1'}),
|
||||||
|
ref='heads/%s' % ref,
|
||||||
|
make=False
|
||||||
|
)
|
||||||
|
updates = env['forwardport.updates'].search([])
|
||||||
|
assert updates
|
||||||
|
assert updates.original_root == pr0_id
|
||||||
|
assert updates.new_root == pr1_id
|
||||||
|
env.run_crons()
|
||||||
|
assert not pr1_id.parent_id
|
||||||
|
assert not env['forwardport.updates'].search([])
|
||||||
|
|
||||||
|
assert pr2.comments == [
|
||||||
|
seen(env, pr2, users),
|
||||||
|
(users['user'], '''This PR targets c and is part of the forward-port chain. Further PRs will be created up to d.
|
||||||
|
|
||||||
|
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
|
||||||
|
'''),
|
||||||
|
(users['reviewer'], 'hansen r+'),
|
||||||
|
(users['user'], """Ancestor PR %s has been updated but this PR is merged and can't be updated to match.
|
||||||
|
|
||||||
|
You may want or need to manually update any followup PR.""" % pr1_id.display_name)
|
||||||
|
]
|
||||||
Loading…
Reference in New Issue
Block a user