@@ -478,6 +478,22 @@ def test_branch_cascade_with_two_three_digit_dev(self):
478478 fixver = ['4.3.18' , '5.1.2' , '5.1.4' , '10.0.0' ]
479479 self .finalize_cascade (branches , tags , destination , fixver )
480480
481+ def test_branch_cascade_with_three_digit_dev_and_hf (self ):
482+ """Test cascade targeting three-digit development branch"""
483+ destination = 'development/4.3.17'
484+ branches = OrderedDict ({
485+ 1 : {'name' : 'development/4.3.15' , 'ignore' : True },
486+ 2 : {'name' : 'development/4.3.17' , 'ignore' : False },
487+ 3 : {'name' : 'development/4.3' , 'ignore' : False },
488+ 4 : {'name' : 'development/5.1.1' , 'ignore' : False },
489+ 5 : {'name' : 'hotfix/5.1.3' , 'ignore' : True },
490+ 6 : {'name' : 'development/5.1' , 'ignore' : False },
491+ 7 : {'name' : 'development/10.0' , 'ignore' : False }
492+ })
493+ tags = ['4.3.14' , '4.3.16' , '5.1.3' ]
494+ fixver = ['4.3.18' , '5.1.2' , '5.1.4' , '10.0.0' ]
495+ self .finalize_cascade (branches , tags , destination , fixver )
496+
481497 def test_branch_cascade_with_three_digit_dev_and_tag_exist (self ):
482498 """Test cascade targeting three-digit development branch"""
483499 destination = 'development/4.3.17'
0 commit comments