From 987e1192a2fec884417e6ef15b70c0f18c46bb06 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Nov 27 2019 15:44:31 +0000 Subject: Drop cloning the fedora-scm-requests git repo Now that monitoring status aren't set in this repo there is no need to have it or interact with it locally anymore. Signed-off-by: Pierre-Yves Chibon --- diff --git a/fedscm_admin/utils.py b/fedscm_admin/utils.py index eeff51b..f9a8a22 100644 --- a/fedscm_admin/utils.py +++ b/fedscm_admin/utils.py @@ -454,10 +454,6 @@ def prompt_for_new_repo(issue_json, issue_body_json, force=False, # master branch is already created at this point. if branch_name != 'master': new_git_branch(namespace, repo, branch_name, use_master=True) - scm_req_git_url = fedscm_admin.pagure.get_scm_requests_git_url( - username=FAS_CLIENT.client.username) - scm_req_git_obj = fedscm_admin.git.GitRepo(scm_req_git_url) - scm_req_git_obj.clone_repo() fedscm_admin.pagure.set_monitoring_status( namespace, repo, issue_body_json['monitor'].strip()) diff --git a/tests/test_admin.py b/tests/test_admin.py index 8bad177..48610ce 100644 --- a/tests/test_admin.py +++ b/tests/test_admin.py @@ -156,8 +156,7 @@ class FedScmAdmin(TestCase): ] for output in outputs: assert output in result.output - # One for fedora-scm-requests - assert self.mock_git_obj.clone_repo.call_count == 1 + assert self.mock_git_obj.clone_repo.call_count == 0 @patch('fedscm_admin.utils.verify_slas', return_value=None) @patch('fedscm_admin.request_utils.retry_session') @@ -204,8 +203,7 @@ class FedScmAdmin(TestCase): ] for output in outputs: assert output in result.output - # One for fedora-scm-requests - assert self.mock_git_obj.clone_repo.call_count == 1 + assert self.mock_git_obj.clone_repo.call_count == 0 @patch('fedscm_admin.utils.verify_slas', return_value=None) @patch('fedscm_admin.request_utils.retry_session') @@ -253,8 +251,7 @@ class FedScmAdmin(TestCase): ] for output in outputs: assert output in result.output - # One for fedora-scm-requests - assert self.mock_git_obj.clone_repo.call_count == 1 + assert self.mock_git_obj.clone_repo.call_count == 0 @patch('fedscm_admin.utils.verify_slas', return_value=None) @patch('fedscm_admin.request_utils.retry_session') @@ -289,8 +286,7 @@ class FedScmAdmin(TestCase): assert 'New Repo for "rpms/nethack"' in result.output assert 'The Pagure repository was created' in result.output assert 'You may create the branch' not in result.output - # One for fedora-scm-requests - assert self.mock_git_obj.clone_repo.call_count == 1 + assert self.mock_git_obj.clone_repo.call_count == 0 @patch('fedscm_admin.utils.verify_slas', return_value=None) @patch('fedscm_admin.request_utils.retry_session') @@ -335,8 +331,7 @@ class FedScmAdmin(TestCase): assert 'The Pagure repository was created' in result.output assert 'You may commit to the branch "epel7" in about 10 minutes.' in \ result.output - # One for fedora-scm-requests - assert self.mock_git_obj.clone_repo.call_count == 1 + assert self.mock_git_obj.clone_repo.call_count == 0 @patch('fedscm_admin.utils.verify_slas', return_value=None) @patch('fedscm_admin.request_utils.retry_session') @@ -377,8 +372,7 @@ class FedScmAdmin(TestCase): assert result.exit_code == 0 assert 'New Repo for "rpms/nethack"' in result.output assert 'The Pagure repository was created' in result.output - # One for fedora-scm-requests - assert self.mock_git_obj.clone_repo.call_count == 1 + assert self.mock_git_obj.clone_repo.call_count == 0 @patch('fedscm_admin.utils.verify_slas', return_value=None) @patch('fedscm_admin.request_utils.retry_session') @@ -711,7 +705,6 @@ class FedScmAdmin(TestCase): mock_values.get_mock_pdc_branch('master', exists=False), mock_values.get_mock_pdc_global_component(exists=True), mock_values.get_mock_pdc_branch(None, exists=False), - mock_values.get_mock_pagure_git_urls(), mock_values.get_mock_pagure_project(exists=True), mock_values.get_mock_pagure_git_urls(is_project=True), mock_values.get_mock_pdc_branch(None, exists=False), @@ -730,8 +723,8 @@ class FedScmAdmin(TestCase): assert 'New Branch "abc" for "rpms/nethack"' in result.output assert 'New Repo for "rpms/nethack"' in result.output assert 'All done!' in result.output - # One for fedora-scm-requests and one for getting the inital commit - assert self.mock_git_obj.clone_repo.call_count == 2 + # One for getting the inital commit + assert self.mock_git_obj.clone_repo.call_count == 1 @patch('fedscm_admin.utils.verify_slas', return_value=None) @patch('fedscm_admin.request_utils.retry_session')