Commit04e31d5

committed

Update tests to check for base branches which have dashes in them.

1 parentc5f7faf commit04e31d5Copy full SHA for 04e31d5

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,16 @@ def changedir(d):`
`33`	`33`
`34`	`34`
`35`	`35`	`deftest_get_base_branch():`
	`36`	`+# The format of cherry-pick branches we create are "backport-{SHA}-{base_branch}"`
`36`	`37`	`cherry_pick_branch='backport-afc23f4-2.7'`
`37`	`38`	`result=get_base_branch(cherry_pick_branch)`
`38`	`39`	`assertresult=='2.7'`
`39`	`40`
`40`	`41`
`41`		`-deftest_get_base_branch_without_dash():`
`42`		`-cherry_pick_branch='master'`
	`42`	`+deftest_get_base_branch_which_has_dashes():`
	`43`	`+cherry_pick_branch='backport-afc23f4-baseprefix-2.7-basesuffix'`
`43`	`44`	`result=get_base_branch(cherry_pick_branch)`
`44`		`-assertresult=='master'`
	`45`	`+assertresult=='prefix-2.7-suffix'`
`45`	`46`
`46`	`47`
`47`	`48`	`@mock.patch('subprocess.check_output')`

Comments

(0)