From 3e40c38e89438dcaa59013b742effc7a2c12ca5b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 9 Mar 2020 14:20:59 +0100 Subject: [PATCH] [FIX] forwardport: fix forward-port Odoo wiki link --- forwardport/models/project.py | 2 +- forwardport/tests/test_limit.py | 4 ++-- forwardport/tests/test_simple.py | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forwardport/models/project.py b/forwardport/models/project.py index 2a780e27..424795e1 100644 --- a/forwardport/models/project.py +++ b/forwardport/models/project.py @@ -671,7 +671,7 @@ class PullRequests(models.Model): source = pr.source_id or pr (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: footer = '\n**WARNING** at least one co-dependent PR (%s) ' \ 'did not properly forward-port, you will need to ' \ diff --git a/forwardport/tests/test_limit.py b/forwardport/tests/test_limit.py index 4dfada96..32f3e73e 100644 --- a/forwardport/tests/test_limit.py +++ b/forwardport/tests/test_limit.py @@ -205,7 +205,7 @@ This PR targets b and is the last of the forward-port chain. To merge the full chain, say > @%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'])), ] @@ -250,7 +250,7 @@ def test_limit_after_merge(env, config, make_repo, users): (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-and-Forwardbot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port """), (users['reviewer'], bot_name + ' up to b'), (bot_name, "Sorry, forward-port limit can only be set on an origin PR" diff --git a/forwardport/tests/test_simple.py b/forwardport/tests/test_simple.py index 3374cb29..86e13e14 100644 --- a/forwardport/tests/test_simple.py +++ b/forwardport/tests/test_simple.py @@ -142,7 +142,7 @@ This PR targets c and is the last of the forward-port chain containing: To merge the full chain, say > @%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'], pr1.display_name, @@ -251,7 +251,7 @@ def test_update_pr(env, config, make_repo, users): 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-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) @@ -463,7 +463,7 @@ def test_update_merged(env, make_repo, config, users): 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. -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['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'], """\ 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) @@ -1078,7 +1078,7 @@ class TestClosing: (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-and-Forwardbot#forward-port +More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port """) ]