Skip to content

Commit

Permalink
Fix the test for already existing branch
Browse files Browse the repository at this point in the history
Introduced in python#39
  • Loading branch information
Jackenmen committed Oct 4, 2022
1 parent 766f76c commit dd3cbbc
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cherry_picker/test_cherry_picker.py
Original file line number Diff line number Diff line change
Expand Up @@ -986,12 +986,13 @@ def test_backport_cherry_pick_crash_ignored(


def test_backport_cherry_pick_branch_already_exists(
tmp_git_repo_dir, git_branch, git_add, git_commit, git_checkout
tmp_git_repo_dir, git_branch, git_add, git_commit, git_checkout, git_remote
):
cherry_pick_target_branches = ("3.8",)
pr_remote = "origin"
test_file = "some.file"
tmp_git_repo_dir.join(test_file).write("some contents")
git_remote("add", pr_remote, "https://github.com/python/cpython.git")
git_branch(cherry_pick_target_branches[0])
git_branch(
f"{pr_remote}/{cherry_pick_target_branches[0]}", cherry_pick_target_branches[0]
Expand Down

0 comments on commit dd3cbbc

Please sign in to comment.