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

[FIX] forwardport: fix forward-port Odoo wiki link

Browse Source
This commit is contained in:
Christophe Monniez 2020-03-09 14:20:59 +01:00 committed by xmo-odoo
parent 0b73e5c640
commit 3e40c38e89
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forwardport/models/project.py
View File

@ -671,7 +671,7 @@ class PullRequests(models.Model):
source = pr.source_id or pr source = pr.source_id or pr
(h, out, err) = conflicts.get(pr) or (None, None, None) (h, out, err) = conflicts.get(pr) or (None, None, None)
footer = '\nMore info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port\n' footer = '\nMore info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port\n'
if has_conflicts and not h: if has_conflicts and not h:
footer = '\n**WARNING** at least one co-dependent PR (%s) ' \ footer = '\n**WARNING** at least one co-dependent PR (%s) ' \
'did not properly forward-port, you will need to ' \ 'did not properly forward-port, you will need to ' \

4
forwardport/tests/test_limit.py
View File

@ -205,7 +205,7 @@ This PR targets b and is the last of the forward-port chain.
To merge the full chain, say To merge the full chain, say
> @%s r+ > @%s r+
More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
""" % (users['user'], users['reviewer'], users['user'])), """ % (users['user'], users['reviewer'], users['user'])),
] ]
@ -250,7 +250,7 @@ def test_limit_after_merge(env, config, make_repo, users):
(users['user'], """\ (users['user'], """\
This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. 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-and-Forwardbot#forward-port More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
"""), """),
(users['reviewer'], bot_name + ' up to b'), (users['reviewer'], bot_name + ' up to b'),
(bot_name, "Sorry, forward-port limit can only be set on an origin PR" (bot_name, "Sorry, forward-port limit can only be set on an origin PR"

10
forwardport/tests/test_simple.py
View File

@ -142,7 +142,7 @@ This PR targets c and is the last of the forward-port chain containing:
To merge the full chain, say To merge the full chain, say
> @%s r+ > @%s r+
More info at https://github.com/odoo/odoo/wiki/Mergebot-and-Forwardbot#forward-port More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
""" % ( """ % (
users['other'], users['reviewer'], users['other'], users['reviewer'],
pr1.display_name, pr1.display_name,
@ -251,7 +251,7 @@ def test_update_pr(env, config, make_repo, users):
fp_intermediate = (users['user'], '''\ fp_intermediate = (users['user'], '''\
This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. 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-and-Forwardbot#forward-port 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) ci_warning = (users['user'], 'Ping @%(user)s, @%(reviewer)s\n\nci/runbot failed on this forward-port PR' % users)
@ -463,7 +463,7 @@ def test_update_merged(env, make_repo, config, users):
assert prod.get_pr(pr2.number).comments == [ assert prod.get_pr(pr2.number).comments == [
(users['user'], '''This PR targets c and is part of the forward-port chain. Further PRs will be created up to d. (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-and-Forwardbot#forward-port More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
'''), '''),
(users['reviewer'], 'hansen r+'), (users['reviewer'], 'hansen r+'),
(users['user'], """Ancestor PR %s has been updated but this PR is merged and can't be updated to match. (users['user'], """Ancestor PR %s has been updated but this PR is merged and can't be updated to match.
@ -982,7 +982,7 @@ def test_batched(env, config, make_repo, users):
(users['user'], """\ (users['user'], """\
This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. 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-and-Forwardbot#forward-port More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
"""), """),
] ]
pr_remote_1b = main1.get_pr(pr1b.number) pr_remote_1b = main1.get_pr(pr1b.number)
@ -1078,7 +1078,7 @@ class TestClosing:
(users['user'], """\ (users['user'], """\
This PR targets b and is part of the forward-port chain. Further PRs will be created up to c. 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-and-Forwardbot#forward-port More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
""") """)
] ]