| |
@@ -878,7 +878,7 @@
|
| |
def test_request_branch(self, mock_grb, mock_request_post):
|
| |
"""Tests request-branch"""
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
mock_rv = Mock()
|
| |
mock_rv.ok = True
|
| |
mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
@@ -914,7 +914,7 @@
|
| |
def test_request_branch_override(self, mock_grb, mock_request_post):
|
| |
"""Tests request-branch with an overriden package and branch name"""
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
mock_rv = Mock()
|
| |
mock_rv.ok = True
|
| |
mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
@@ -948,7 +948,7 @@
|
| |
def test_request_branch_module(self, mock_grb, mock_request_post):
|
| |
"""Tests request-branch for a new module branch"""
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
mock_rv = Mock()
|
| |
mock_rv.ok = True
|
| |
mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
@@ -982,7 +982,7 @@
|
| |
def assert_request_branch_container(self, cli_cmd, mock_grb, mock_request_post):
|
| |
"""Tests request-branch for a new container branch"""
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
mock_rv = Mock()
|
| |
mock_rv.ok = True
|
| |
mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
@@ -1030,7 +1030,7 @@
|
| |
mock_request_post):
|
| |
"""Tests request-branch with service levels"""
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
responses = []
|
| |
for idx in range(2, 5):
|
| |
mock_rv_post = Mock()
|
| |
@@ -1118,7 +1118,7 @@
|
| |
def test_request_branch_all_releases(self, mock_grb, mock_request_post):
|
| |
"""Tests request-branch with the '--all-releases' option """
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
post_side_effect = []
|
| |
for i in range(1, 4):
|
| |
mock_rv = Mock()
|
| |
@@ -1205,7 +1205,7 @@
|
| |
def test_request_branch_sls_on_release_branch_error(self, mock_grb):
|
| |
"""Tests request-branch with a release branch and service levels"""
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
|
| |
cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
'--name', 'nethack', 'request-branch', 'f27', '--sl',
|
| |
@@ -1302,7 +1302,7 @@
|
| |
def test_request_with_repo_option(self, mock_grb, mock_request_post):
|
| |
"""Test request branch with option --repo"""
|
| |
mock_grb.return_value = {'fedora': ['f25', 'f26', 'f27'],
|
| |
- 'epel': ['el6', 'epel7']}
|
| |
+ 'epel': ['el6', 'epel7', 'epel8']}
|
| |
mock_rv = Mock()
|
| |
mock_rv.ok = True
|
| |
mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
@@ -2031,7 +2031,7 @@
|
| |
super(TestReadReleasesFromLocalConfig, self).setUp()
|
| |
self.active_releases = {
|
| |
'fedora': ['f28', 'f27'],
|
| |
- 'epel': ['el6', 'epel7'],
|
| |
+ 'epel': ['el6', 'epel7', 'epel8'],
|
| |
}
|
| |
self.fake_cmd = ['fedpkg', '--path', self.cloned_repo_path, 'build']
|
| |
|
| |
@@ -2074,7 +2074,7 @@
|
| |
|
| |
rels = cli.read_releases_from_local_config(self.active_releases)
|
| |
rels = sorted(rels)
|
| |
- self.assertEqual(['el6', 'epel7', 'f27', 'f28', 'master'], rels)
|
| |
+ self.assertEqual(['el6', 'epel7','epel8', 'f27', 'f28', 'master'], rels)
|
| |
|
| |
|
| |
class TestIsStreamBranch(CliTestCase):
|
| |
@@ -2136,7 +2136,7 @@
|
| |
self, get_release_branches, get_stream_branches, _build):
|
| |
get_release_branches.return_value = {
|
| |
'fedora': ['f28', 'f27'],
|
| |
- 'epel': ['el6', 'epel7'],
|
| |
+ 'epel': ['el6', 'epel7', 'epel8'],
|
| |
}
|
| |
get_stream_branches.return_value = [{'name': '8', 'active': True}]
|
| |
self.checkout_branch(git.Repo(self.cloned_repo_path), '8')
|
| |
@@ -2158,7 +2158,7 @@
|
| |
self, get_release_branches, get_stream_branches, _build):
|
| |
get_release_branches.return_value = {
|
| |
'fedora': ['f28', 'f27'],
|
| |
- 'epel': ['el6', 'epel7'],
|
| |
+ 'epel': ['el6', 'epel7', 'epel8'],
|
| |
}
|
| |
get_stream_branches.return_value = [{'name': '8', 'active': True}]
|
| |
self.checkout_branch(git.Repo(self.cloned_repo_path), '8')
|
| |
@@ -2185,7 +2185,7 @@
|
| |
_build):
|
| |
get_release_branches.return_value = {
|
| |
'fedora': ['f28', 'f27'],
|
| |
- 'epel': ['el6', 'epel7'],
|
| |
+ 'epel': ['el6', 'epel7', 'epel8'],
|
| |
}
|
| |
get_stream_branches.return_value = [{'name': '8', 'active': True}]
|
| |
_build.side_effect = [1, 2]
|
| |
@@ -2226,7 +2226,7 @@
|
| |
self.assertEqual(expected_output, output)
|
| |
|
| |
def test_print_epel_releases_only(self, mock_grb):
|
| |
- self.assert_output_releases('el6 epel7', option=['--epel'])
|
| |
+ self.assert_output_releases('el6 epel7 epel8', option=['--epel'])
|
| |
|
| |
def test_print_fedora_releases_only(self, mock_grb):
|
| |
self.assert_output_releases('f29 f28', option=['--fedora'])
|
| |
In trying to fix issue 334 I attempted to make changes which matched current code style maybe