Skip to content
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

Fix detection of upstream version branches with continue #265

Merged
merged 2 commits into from
Jul 9, 2018
Merged

Fix detection of upstream version branches with continue #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f7faf
Fix detection of upstream version branches with continue
abadger Jun 16, 2018
f90d993
Update tests to check for base branches which have dashes in them.
abadger Jun 16, 2018
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
2 changes: 1 addition & 1 deletion cherry_picker/cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ def get_base_branch(cherry_pick_branch):
"""
return '2.7' from 'backport-sha-2.7'
"""
prefix, sep, base_branch = cherry_pick_branch.rpartition('-')
prefix, sha, base_branch = cherry_pick_branch.split('-', 2)
return base_branch


Expand Down
7 changes: 4 additions & 3 deletions cherry_picker/cherry_picker/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ def changedir(d):


def test_get_base_branch():
# The format of cherry-pick branches we create are "backport-{SHA}-{base_branch}"
cherry_pick_branch = 'backport-afc23f4-2.7'
result = get_base_branch(cherry_pick_branch)
assert result == '2.7'


def test_get_base_branch_without_dash():
cherry_pick_branch ='master'
def test_get_base_branch_which_has_dashes():
cherry_pick_branch ='backport-afc23f4-baseprefix-2.7-basesuffix'
result = get_base_branch(cherry_pick_branch)
assert result == 'master'
assert result == 'baseprefix-2.7-basesuffix'


@mock.patch('subprocess.check_output')
Expand Down