| |
@@ -262,9 +262,9 @@
|
| |
self.assert_rpmdefines()
|
| |
|
| |
@patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
|
| |
- @patch('fedpkg.Commands._findmasterbranch')
|
| |
- def test_load_master_dist_tag(self, _findmasterbranch, branch_merge):
|
| |
- _findmasterbranch.return_value = '28'
|
| |
+ @patch('fedpkg.Commands._findrawhidebranch')
|
| |
+ def test_load_master_dist_tag(self, _findrawhidebranch, branch_merge):
|
| |
+ _findrawhidebranch.return_value = '28'
|
| |
branch_merge.return_value = 'master'
|
| |
|
| |
self.cmd.load_rpmdefines()
|
| |
@@ -324,11 +324,11 @@
|
| |
self.assert_rpmdefines(extra_rpmdefines)
|
| |
|
| |
|
| |
- class TestFindMasterBranch(CommandTestCase):
|
| |
- """Test Commands._findmasterbranch"""
|
| |
+ class TestFindRawhideBranch(CommandTestCase):
|
| |
+ """Test Commands._findrawhidebranch"""
|
| |
|
| |
def setUp(self):
|
| |
- super(TestFindMasterBranch, self).setUp()
|
| |
+ super(TestFindRawhideBranch, self).setUp()
|
| |
|
| |
self.cmd = self.make_commands()
|
| |
|
| |
@@ -338,7 +338,7 @@
|
| |
koji_session = kojisession.return_value
|
| |
koji_session.getBuildTarget.return_value = {'dest_tag_name': 'f28'}
|
| |
|
| |
- result = self.cmd._findmasterbranch()
|
| |
+ result = self.cmd._findrawhidebranch()
|
| |
|
| |
koji_session.getBuildTarget.assert_called_once_with('rawhide')
|
| |
self.assertEqual('28', result)
|
| |
@@ -352,7 +352,7 @@
|
| |
koji_session = anon_kojisession.return_value
|
| |
koji_session.getBuildTarget.return_value = {'dest_tag_name': 'f29'}
|
| |
|
| |
- result = self.cmd._findmasterbranch()
|
| |
+ result = self.cmd._findrawhidebranch()
|
| |
|
| |
koji_session.getBuildTarget.assert_called_once_with('rawhide')
|
| |
self.assertEqual('29', result)
|
| |
@@ -363,7 +363,7 @@
|
| |
# As the code shows, any error will be caught
|
| |
koji_session.getBuildTarget.side_effect = ValueError
|
| |
|
| |
- result = self.cmd._findmasterbranch()
|
| |
+ result = self.cmd._findrawhidebranch()
|
| |
self.assertEqual(28, result)
|
| |
|
| |
@patch('pyrpkg.Commands.anon_kojisession', new_callable=PropertyMock)
|
| |
@@ -378,7 +378,7 @@
|
| |
|
| |
six.assertRaisesRegex(
|
| |
self, rpkgError, 'Unable to find rawhide target',
|
| |
- self.cmd._findmasterbranch)
|
| |
+ self.cmd._findrawhidebranch)
|
| |
|
| |
|
| |
class TestOverrideBuildURL(CommandTestCase):
|
| |
In some places we also reference main which will be a symlink to
the rawhide branch and we currently still reference master to be
backward compatible (even though once the rawhide branch appears
the master branch will be removed and blocked).
Signed-off-by: Pierre-Yves Chibon pingou@pingoured.fr