NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 15:35:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] *: dashboard when PRs have different limits

Browse Source 
The code selecting the lower and upper bounds for the PR dashboard did
not deal correctly with getting multiple limits in the same genealogy.
This commit is contained in:
Xavier Morel 2024-06-12 15:09:47 +02:00
parent 81f133de15
commit d010f0374a
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
forwardport/tests/test_limit.py
View File

@ -1,5 +1,5 @@
import pytest
import requests
from utils import seen, Commit, make_basic, to_pr
@ -9,28 +9,41 @@ from utils import seen, Commit, make_basic, to_pr
pytest.param('b', 'b', 0, id='current'),
pytest.param('b', 'a', 0, id='earlier'),
])
def test_configure_fp_limit(env, config, make_repo, source, limit, count):
prod, other = make_basic(env, config, make_repo)
def test_configure_fp_limit(env, config, make_repo, source, limit, count, port):
prod, other = make_basic(env, config, make_repo, statuses="default")
with prod:
[c] = prod.make_commits(
source, Commit('c', tree={'f': 'g'}),
ref='heads/branch',
)
pr = prod.make_pr(target=source, head='branch')
prod.post_status(c, 'success', 'legal/cla')
prod.post_status(c, 'success', 'ci/runbot')
prod.post_status(c, 'success')
pr.post_comment(f'hansen r+ up to {limit}', config['role_reviewer']['token'])
env.run_crons()
with prod:
prod.post_status(f'staging.{source}', 'success', 'legal/cla')
prod.post_status(f'staging.{source}', 'success', 'ci/runbot')
prod.post_status(f'staging.{source}', 'success')
env.run_crons()
pr_id = to_pr(env, pr)
descendants = env['runbot_merge.pull_requests'].search([
('source_id', '=', to_pr(env, pr).id)
('source_id', '=', pr_id.id)
])
assert len(descendants) == count
limit_id = env['runbot_merge.branch'].search([('name', '=', limit)])
assert pr_id.limit_id == limit_id
assert not descendants.limit_id, "descendant should not inherit the limit explicitly"
# check that the basic thingie works
r = requests.get(f'http://localhost:{port}/{prod.name}/pull/{pr.number}.png')
assert r.ok, r.text
if descendants:
c = env['runbot_merge.branch'].search([('name', '=', 'c')])
descendants.limit_id = c.id
r = requests.get(f'http://localhost:{port}/{prod.name}/pull/{pr.number}.png')
assert r.ok
def test_ignore(env, config, make_repo):
""" Provide an "ignore" command which is equivalent to setting the limit

6
runbot_merge/views/templates.xml
View File

@ -462,10 +462,12 @@ elif all(p.state in ('merged', 'closed') for p in genealogy[-1].all_prs):
else:
# if the tip of the genealogy is not closed, extend to the furthest limit,
# keeping branches which are active or have an associated batch / PR
limit = genealogy.prs.limit_id.sorted(lambda b: (b.sequence, b.name))
limit = min(genealogy.prs.limit_id, key=lambda b: (b.sequence, b.name), default=None)
limit_high = project.branch_ids.ids.index(limit.id) if limit else None
limit = targets.sorted(lambda b: (b.sequence, b.name))[-1]
limit = max(targets, key=lambda b: (b.sequence, b.name))
limit_low = project.branch_ids.ids.index(limit.id)
branches = project.branch_ids[limit_high:limit_low+1].filtered(lambda b: b.active or b in targets)[::-1]
action = (project, repos, branches, genealogy)