Skip to content

Fix the tests #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2022
Merged

Fix the tests #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3cbbc
Fix the test for already existing branch
Jackenmen Oct 4, 2022
3bc9c1d
Fix the test for backport pause and continue
Jackenmen Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cherry_picker/test_cherry_picker.py
View file
Open in desktop
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 Expand Up @@ -1052,12 +1053,13 @@ def test_backport_success(
@pytest.mark.parametrize("already_committed", (True, False))
@pytest.mark.parametrize("push", (True, False))
def test_backport_pause_and_continue(
tmp_git_repo_dir, git_branch, git_add, git_commit, git_checkout, git_reset, already_committed, push
tmp_git_repo_dir, git_branch, git_add, git_commit, git_checkout, git_reset, git_remote, already_committed, push
):
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