diff --git a/src/oca_github_bot/manifest.py b/src/oca_github_bot/manifest.py index a51273f9..330d26fa 100644 --- a/src/oca_github_bot/manifest.py +++ b/src/oca_github_bot/manifest.py @@ -257,7 +257,6 @@ def user_can_push(gh, org, repo, username, addons_dir, target_branch): if target_branch in other_branches: other_branches.remove(target_branch) - return is_maintainer_other_branches( org, repo, username, modified_addons, other_branches ) diff --git a/tests/test_manifest.py b/tests/test_manifest.py index f1a4c101..65ec2509 100644 --- a/tests/test_manifest.py +++ b/tests/test_manifest.py @@ -237,6 +237,11 @@ def test_is_maintainer(tmp_path): assert not is_maintainer("u2", [addon1, addon2, addon3]) assert not is_maintainer("u1", [tmp_path / "not_an_addon"]) + def test_is_maintainer_other_branches(): - assert is_maintainer_other_branches("OCA", "mis-builder", "sbidoul", {"mis_builder"}, ["12.0"]) - assert not is_maintainer_other_branches("OCA", "mis-builder", "fpdoo", {"mis_builder"}, ["12.0"]) + assert is_maintainer_other_branches( + "OCA", "mis-builder", "sbidoul", {"mis_builder"}, ["12.0"] + ) + assert not is_maintainer_other_branches( + "OCA", "mis-builder", "fpdoo", {"mis_builder"}, ["12.0"] + )