| |
@@ -10,15 +10,22 @@
|
| |
# option) any later version. See http://www.gnu.org/copyleft/gpl.html for
|
| |
# the full text of the license.
|
| |
|
| |
- import six
|
| |
+ import sys
|
| |
+ import json
|
| |
+ from datetime import datetime, timedelta
|
| |
+ from tempfile import mkdtemp
|
| |
+ from os import rmdir
|
| |
|
| |
+ import six
|
| |
from six.moves.configparser import NoOptionError
|
| |
from six.moves.configparser import NoSectionError
|
| |
+ from six.moves import StringIO
|
| |
|
| |
from pyrpkg.errors import rpkgError
|
| |
from utils import CliTestCase
|
| |
+ from fedpkg.bugzilla import BugzillaClient
|
| |
|
| |
- from mock import call, patch, mock_open, PropertyMock
|
| |
+ from mock import call, patch, mock_open, PropertyMock, Mock
|
| |
|
| |
|
| |
class TestUpdate(CliTestCase):
|
| |
@@ -181,3 +188,769 @@
|
| |
'--user', 'someone', '--staging', self.mock_nvr.return_value],
|
| |
shell=True)
|
| |
])
|
| |
+
|
| |
+
|
| |
+ @patch.object(BugzillaClient, 'client')
|
| |
+ class TestRequestRepo(CliTestCase):
|
| |
+ """Test the request-repo command"""
|
| |
+
|
| |
+ def setUp(self):
|
| |
+ self.mock_bug = Mock()
|
| |
+ self.mock_bug.creator = 'Tom Hanks'
|
| |
+ self.mock_bug.component = 'Package Review'
|
| |
+ self.mock_bug.product = 'Fedora'
|
| |
+ self.mock_bug.assigned_to = 'Tom Brady'
|
| |
+ self.mock_bug.setter = 'Tom Brady'
|
| |
+ mod_date = Mock()
|
| |
+ mod_date.value = datetime.utcnow().strftime('%Y%m%dT%H:%M:%S')
|
| |
+ self.mock_bug.flags = [{
|
| |
+ 'status': '+',
|
| |
+ 'name': 'fedora-review',
|
| |
+ 'type_id': 65,
|
| |
+ 'is_active': 1,
|
| |
+ 'id': 1441813,
|
| |
+ 'setter': 'Tom Brady',
|
| |
+ 'modification_date': mod_date
|
| |
+ }]
|
| |
+ self.mock_bug.summary = ('Review Request: nethack - A rogue-like '
|
| |
+ 'single player dungeon exploration game')
|
| |
+ super(TestRequestRepo, self).setUp()
|
| |
+
|
| |
+ def get_cli(self, cli_cmd, name='fedpkg-stage', cfg='fedpkg-stage.conf',
|
| |
+ user_cfg='fedpkg-user-stage.conf'):
|
| |
+ with patch('sys.argv', new=cli_cmd):
|
| |
+ return self.new_cli(name=name, cfg=cfg, user_cfg=user_cfg)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_repo(self, mock_request_post, mock_bz):
|
| |
+ """Tests a standard request-repo call"""
|
| |
+ self.mock_bug.summary = ('Review Request: testpkg - a description')
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_repo()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_repo',
|
| |
+ 'branch': 'master',
|
| |
+ 'bug_id': 1441813,
|
| |
+ 'description': '',
|
| |
+ 'exception': False,
|
| |
+ 'monitor': 'monitoring',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'repo': 'testpkg',
|
| |
+ 'summary': 'a description',
|
| |
+ 'upstreamurl': ''
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_repo_override(self, mock_request_post, mock_bz):
|
| |
+ """Tests a request-repo call with an overridden repo name"""
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_repo()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_repo',
|
| |
+ 'branch': 'master',
|
| |
+ 'bug_id': 1441813,
|
| |
+ 'description': '',
|
| |
+ 'exception': False,
|
| |
+ 'monitor': 'monitoring',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'summary': ('A rogue-like single player dungeon exploration '
|
| |
+ 'game'),
|
| |
+ 'upstreamurl': ''
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_repo_module(self, mock_request_post, mock_bz):
|
| |
+ """Tests a request-repo call for a new module"""
|
| |
+ self.mock_bug.product = 'Fedora Modules'
|
| |
+ self.mock_bug.component = 'Module Review'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'modules/nethack', 'request-repo',
|
| |
+ '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_repo()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_repo',
|
| |
+ 'branch': 'master',
|
| |
+ 'bug_id': 1441813,
|
| |
+ 'description': '',
|
| |
+ 'exception': False,
|
| |
+ 'monitor': 'monitoring',
|
| |
+ 'namespace': 'modules',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'summary': ('A rogue-like single player dungeon exploration '
|
| |
+ 'game'),
|
| |
+ 'upstreamurl': ''
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_repo_container(self, mock_request_post, mock_bz):
|
| |
+ """Tests a request-repo call for a new container"""
|
| |
+ self.mock_bug.product = 'Fedora Container Images'
|
| |
+ self.mock_bug.component = 'Container Review'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'container/nethack', 'request-repo',
|
| |
+ '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_repo()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_repo',
|
| |
+ 'branch': 'master',
|
| |
+ 'bug_id': 1441813,
|
| |
+ 'description': '',
|
| |
+ 'exception': False,
|
| |
+ 'monitor': 'monitoring',
|
| |
+ 'namespace': 'container',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'summary': ('A rogue-like single player dungeon exploration '
|
| |
+ 'game'),
|
| |
+ 'upstreamurl': ''
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_repo_with_optional_details(
|
| |
+ self, mock_request_post, mock_bz):
|
| |
+ """Tests a request-repo call with the optional details"""
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813', '-d',
|
| |
+ 'a description', '-s', 'a summary', '-m', 'no-monitoring',
|
| |
+ '-u', 'http://test.local']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_repo()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_repo',
|
| |
+ 'branch': 'master',
|
| |
+ 'bug_id': 1441813,
|
| |
+ 'description': 'a description',
|
| |
+ 'exception': False,
|
| |
+ 'monitor': 'no-monitoring',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'summary': 'a summary',
|
| |
+ 'upstreamurl': 'http://test.local'
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_repo_exception(self, mock_request_post, mock_bz):
|
| |
+ """Tests a request-repo call with the exception flag"""
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '--exception']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_repo()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_repo',
|
| |
+ 'branch': 'master',
|
| |
+ 'bug_id': '',
|
| |
+ 'description': '',
|
| |
+ 'exception': True,
|
| |
+ 'monitor': 'monitoring',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'summary': '',
|
| |
+ 'upstreamurl': ''
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+ # Since it is an exception, Bugzilla will not have been queried
|
| |
+ mock_bz.getbug.assert_not_called()
|
| |
+
|
| |
+ def test_request_repo_wrong_package(self, mock_bz):
|
| |
+ """Tests request-repo errors when the package is wrong"""
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'not-nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = ('The package in the Bugzilla bug "nethack" doesn\'t '
|
| |
+ 'match the one provided "not-nethack"')
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_wrong_bug_product(self, mock_bz):
|
| |
+ """Tests request-repo errors when the bug product is not Fedora"""
|
| |
+ self.mock_bug.product = 'Red Hat'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = \
|
| |
+ 'The Bugzilla bug provided is not for "Fedora" or "Fedora EPEL"'
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_invalid_summary(self, mock_bz):
|
| |
+ """Tests request-repo errors when the bug summary has no colon"""
|
| |
+ self.mock_bug.summary = 'I am so wrong'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = \
|
| |
+ 'Invalid title for this Bugzilla bug (no ":" present)'
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_invalid_summary_two(self, mock_bz):
|
| |
+ """Tests request-repo errors when the bug summary has no dash"""
|
| |
+ self.mock_bug.summary = 'So:Wrong'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = \
|
| |
+ 'Invalid title for this Bugzilla bug (no "-" present)'
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_wrong_summary(self, mock_bz):
|
| |
+ """Tests request-repo errors when the bug summary is wrong"""
|
| |
+ self.mock_bug.summary = ('Review Request: fedpkg - lorum ipsum')
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = ('The package in the Bugzilla bug "fedpkg" doesn\'t '
|
| |
+ 'match the one provided "nethack"')
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_expired_bug(self, mock_bz):
|
| |
+ """Tests request-repo errors when the bug was approved over 60 days ago
|
| |
+ """
|
| |
+ self.mock_bug.flags[0]['modification_date'].value = \
|
| |
+ (datetime.utcnow() - timedelta(days=75)).strftime(
|
| |
+ '%Y%m%dT%H:%M:%S')
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = \
|
| |
+ 'The Bugzilla bug\'s review was approved over 60 days ago'
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_bug_not_approved(self, mock_bz):
|
| |
+ """Tests request-repo errors when the bug is not approved"""
|
| |
+ self.mock_bug.flags[0]['name'] = 'something else'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = 'The Bugzilla bug is not approved yet'
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_bug_not_assigned(self, mock_bz):
|
| |
+ """Tests request-repo errors when the bug is not assigned"""
|
| |
+ self.mock_bug.assigned_to = None
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = 'The Bugzilla bug provided is not assigned to anyone'
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_invalid_name(self, mock_bz):
|
| |
+ """Tests request-repo errors when the repo name is invalid"""
|
| |
+ self.mock_bug.product = 'Red Hat'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', '$nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = (
|
| |
+ 'The repository name "$nethack" is invalid. It must be at least '
|
| |
+ 'two characters long with only letters, numbers, hyphens, '
|
| |
+ 'underscores, plus signs, and/or periods. Please note that the '
|
| |
+ 'project cannot start with a period or a plus sign.')
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ def test_request_repo_pagure_error(self, mock_request_post, mock_bz):
|
| |
+ """Tests a standard request-repo call when the Pagure API call fails"""
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo', '1441813']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = False
|
| |
+ mock_rv.json.return_value = {'error': 'some error'}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ expected_error = ('The following error occurred while creating a '
|
| |
+ 'new issue in Pagure: some error')
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_repo_no_bug(self, mock_bz):
|
| |
+ """Tests request-repo errors when no bug or exception is provided"""
|
| |
+ self.mock_bug.product = 'Red Hat'
|
| |
+ mock_bz.getbug.return_value = self.mock_bug
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-repo']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = \
|
| |
+ 'A Bugzilla bug is required on new repository requests'
|
| |
+ try:
|
| |
+ cli.request_repo()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+
|
| |
+ class TestRequestBranch(CliTestCase):
|
| |
+ """Test the request-branch command"""
|
| |
+
|
| |
+ def setUp(self):
|
| |
+ super(TestRequestBranch, self).setUp()
|
| |
+
|
| |
+ def tearDown(self):
|
| |
+ super(TestRequestBranch, self).tearDown()
|
| |
+
|
| |
+ def get_cli(self, cli_cmd, name='fedpkg-stage', cfg='fedpkg-stage.conf',
|
| |
+ user_cfg='fedpkg-user-stage.conf'):
|
| |
+ with patch('sys.argv', new=cli_cmd):
|
| |
+ return self.new_cli(name=name, cfg=cfg, user_cfg=user_cfg)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_branch(self, mock_grb, mock_request_post):
|
| |
+ """Tests request-branch"""
|
| |
+ mock_grb.return_value = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+ # Checkout the f27 branch
|
| |
+ self.run_cmd(['git', 'checkout', 'f27'], cwd=self.cloned_repo_path)
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ 'request-branch']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_branch()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_branch',
|
| |
+ 'repo': 'testpkg',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'branch': 'f27',
|
| |
+ 'create_git_branch': True
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ 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 = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-branch', 'f27']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_branch()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_branch',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'branch': 'f27',
|
| |
+ 'create_git_branch': True
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_branch_module(self, mock_grb, mock_request_post):
|
| |
+ """Tests request-branch for a new module branch"""
|
| |
+ mock_grb.return_value = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'modules/nethack', 'request-branch', 'f27']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_branch()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_branch',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'namespace': 'modules',
|
| |
+ 'branch': 'f27',
|
| |
+ 'create_git_branch': True
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_branch_container(self, mock_grb, mock_request_post):
|
| |
+ """Tests request-branch for a new container branch"""
|
| |
+ mock_grb.return_value = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'container/nethack', 'request-branch',
|
| |
+ 'f27']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_branch()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_branch',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'namespace': 'container',
|
| |
+ 'branch': 'f27',
|
| |
+ 'create_git_branch': True
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ @patch('fedpkg.cli.verify_sls')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_branch_sls(self, mock_verify_sls, mock_grb,
|
| |
+ mock_request_post):
|
| |
+ """Tests request-branch with service levels"""
|
| |
+ mock_grb.return_value = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+ mock_rv_post = Mock()
|
| |
+ mock_rv_post.ok = True
|
| |
+ mock_rv_post.json.return_value = {'issue': {'id': 2}}
|
| |
+ mock_request_post.return_value = mock_rv_post
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-branch', '9', '--sl',
|
| |
+ 'security_fixes:2030-12-01', 'bug_fixes:2030-12-01']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_branch()
|
| |
+
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_branch',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'branch': '9',
|
| |
+ 'create_git_branch': True,
|
| |
+ 'sls': {
|
| |
+ 'security_fixes': '2030-12-01',
|
| |
+ 'bug_fixes': '2030-12-01'
|
| |
+ }
|
| |
+ }
|
| |
+ # Get the data that was submitted to Pagure
|
| |
+ post_data = mock_request_post.call_args_list[0][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = ('https://pagure.stg.example.com/releng/'
|
| |
+ 'fedora-scm-requests/issue/2')
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ @patch('requests.post')
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ @patch('sys.stdout', new=StringIO())
|
| |
+ def test_request_branch_all_releases(self, mock_grb, mock_request_post):
|
| |
+ """Tests request-branch with the '--all-releases' option """
|
| |
+ mock_grb.return_value = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+ post_side_effect = []
|
| |
+ for i in range(1, 4):
|
| |
+ mock_rv = Mock()
|
| |
+ mock_rv.ok = True
|
| |
+ mock_rv.json.return_value = {'issue': {'id': i}}
|
| |
+ post_side_effect.append(mock_rv)
|
| |
+ mock_request_post.side_effect = post_side_effect
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-branch',
|
| |
+ '--all-releases']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ cli.request_branch()
|
| |
+
|
| |
+ for i in range(3):
|
| |
+ expected_issue_content = {
|
| |
+ 'action': 'new_branch',
|
| |
+ 'repo': 'nethack',
|
| |
+ 'namespace': 'rpms',
|
| |
+ 'branch': 'f' + str(27 - i),
|
| |
+ 'create_git_branch': True
|
| |
+ }
|
| |
+ post_data = mock_request_post.call_args_list[i][1]['data']
|
| |
+ actual_issue_content = json.loads(json.loads(
|
| |
+ post_data)['issue_content'].strip('```'))
|
| |
+ self.assertEqual(expected_issue_content, actual_issue_content)
|
| |
+
|
| |
+ output = sys.stdout.getvalue().strip()
|
| |
+ expected_output = """\
|
| |
+ https://pagure.stg.example.com/releng/fedora-scm-requests/issue/1
|
| |
+ https://pagure.stg.example.com/releng/fedora-scm-requests/issue/2
|
| |
+ https://pagure.stg.example.com/releng/fedora-scm-requests/issue/3"""
|
| |
+ self.assertEqual(output, expected_output)
|
| |
+
|
| |
+ def test_request_branch_invalid_use_of_all_releases(self):
|
| |
+ """Tests request-branch with a branch and the '--all-releases' option
|
| |
+ """
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-branch', 'f27',
|
| |
+ '--all-releases']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = \
|
| |
+ 'You cannot specify a branch with the "--all-releases" option'
|
| |
+ try:
|
| |
+ cli.request_branch()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_branch_invalid_use_of_all_releases_sl(self):
|
| |
+ """Tests request-branch with an SL and the '--all-releases' option
|
| |
+ """
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-branch',
|
| |
+ '--all-releases', '--sl', 'security_fixes:2020-01-01']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = ('You cannot specify service levels with the '
|
| |
+ '"--all-releases" option')
|
| |
+ try:
|
| |
+ cli.request_branch()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ def test_request_branch_invalid_sls(self, mock_grb):
|
| |
+ """Tests request-branch with invalid service levels"""
|
| |
+ mock_grb.return_value = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-branch', '9', '--sl',
|
| |
+ 'security_fixes-2030-12-01', 'bug_fixes:2030-12-01']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = \
|
| |
+ 'The SL "security_fixes-2030-12-01" is in an invalid format'
|
| |
+ try:
|
| |
+ cli.request_branch()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ @patch('fedpkg.cli.get_release_branches')
|
| |
+ 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 = set(['el6', 'epel7', 'f25', 'f26', 'f27'])
|
| |
+
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'nethack', 'request-branch', 'f27', '--sl',
|
| |
+ 'security_fixes-2030-12-01', 'bug_fixes:2030-12-01']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = 'You can\'t provide SLs for release branches'
|
| |
+ try:
|
| |
+ cli.request_branch()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_branch_invalid_module_branch_name(self):
|
| |
+ """Test request-branch raises an exception when a invalid module branch
|
| |
+ name is supplied"""
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path,
|
| |
+ '--module-name', 'modules/nethack', 'request-branch',
|
| |
+ 'some:branch']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = (
|
| |
+ 'Only characters, numbers, periods, dashes, underscores, and '
|
| |
+ 'pluses are allowed in module branch names')
|
| |
+ try:
|
| |
+ cli.request_branch()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+
|
| |
+ def test_request_branch_no_branch(self):
|
| |
+ """Test request-branch raises an exception when a branch isn't supplied
|
| |
+ """
|
| |
+ tempdir = mkdtemp()
|
| |
+ cli_cmd = ['fedpkg-stage', '--path', tempdir,
|
| |
+ '--module-name', 'nethack', 'request-branch']
|
| |
+ cli = self.get_cli(cli_cmd)
|
| |
+ expected_error = (
|
| |
+ 'You must specify a branch if you are not in a git repository')
|
| |
+ try:
|
| |
+ cli.request_branch()
|
| |
+ assert False, 'rpkgError not raised'
|
| |
+ except rpkgError as error:
|
| |
+ self.assertEqual(str(error), expected_error)
|
| |
+ finally:
|
| |
+ rmdir(tempdir)
|
| |
cqi commented 6 years ago
--user--configdoes not appear in-houtput, e.g.fedpkg -h.