From 00afe2ba9bd817147c02e6eee6a86d94eaadfa8f Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 16 2017 12:18:36 +0000 Subject: Patch ensure_lock out for lib.git tests Signed-off-by: Patrick Uiterwijk --- diff --git a/tests/test_pagure_flask_dump_load_ticket.py b/tests/test_pagure_flask_dump_load_ticket.py index 48ff558..f2da049 100644 --- a/tests/test_pagure_flask_dump_load_ticket.py +++ b/tests/test_pagure_flask_dump_load_ticket.py @@ -55,8 +55,9 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): self.path, 'requests') self.app = pagure.APP.test_client() + @patch('pagure.ensure_lock') @patch('pagure.lib.notify.send_email') - def test_dumping_reloading_ticket(self, send_email): + def test_dumping_reloading_ticket(self, elock, send_email): """ Test dumping a ticket into a JSON blob. """ send_email.return_value = True diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 34d14ee..5511c1e 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2598,87 +2598,88 @@ index 0000000..fb7093d 'Forks 0', output.data) - # add issues - repo = pagure.get_authorized_project(self.session, 'test') - msg = pagure.lib.new_issue( - session=self.session, - repo=repo, - title='Test issue', - content='We should work on this', - user='pingou', - ticketfolder=os.path.join(self.path, 'tickets') - ) - self.session.commit() - self.assertEqual(msg.title, 'Test issue') - - msg = pagure.lib.new_issue( - session=self.session, - repo=repo, - title='Test issue #2', - content='We should work on this, really', - user='pingou', - ticketfolder=os.path.join(self.path, 'tickets') - ) - self.session.commit() - self.assertEqual(msg.title, 'Test issue #2') - - # Add a comment to an issue - issue = pagure.lib.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.add_issue_comment( - session=self.session, - issue=issue, - comment='Hey look a comment!', - user='foo', - ticketfolder=None - ) - self.session.commit() - self.assertEqual(msg, 'Comment added') - - # add pull-requests - req = pagure.lib.new_pull_request( - session=self.session, - repo_from=repo, - branch_from='feature', - repo_to=repo, - branch_to='master', - title='test pull-request', - user='pingou', - requestfolder=os.path.join(self.path, 'requests'), - ) - self.session.commit() - self.assertEqual(req.id, 3) - self.assertEqual(req.title, 'test pull-request') - - req = pagure.lib.new_pull_request( - session=self.session, - repo_from=repo, - branch_from='feature2', - repo_to=repo, - branch_to='master', - title='test pull-request', - user='pingou', - requestfolder=os.path.join(self.path, 'requests'), - ) - self.session.commit() - self.assertEqual(req.id, 4) - self.assertEqual(req.title, 'test pull-request') - - # Add comment on a pull-request - request = pagure.lib.search_pull_requests( - self.session, requestid=3) - - msg = pagure.lib.add_pull_request_comment( - session=self.session, - request=request, - commit='commithash', - tree_id=None, - filename='file', - row=None, - comment='This is awesome, I got to remember it!', - user='foo', - requestfolder=None, - ) - self.assertEqual(msg, 'Comment added') + with patch('pagure.ensure_lock'): + # add issues + repo = pagure.get_authorized_project(self.session, 'test') + msg = pagure.lib.new_issue( + session=self.session, + repo=repo, + title='Test issue', + content='We should work on this', + user='pingou', + ticketfolder=os.path.join(self.path, 'tickets') + ) + self.session.commit() + self.assertEqual(msg.title, 'Test issue') + + msg = pagure.lib.new_issue( + session=self.session, + repo=repo, + title='Test issue #2', + content='We should work on this, really', + user='pingou', + ticketfolder=os.path.join(self.path, 'tickets') + ) + self.session.commit() + self.assertEqual(msg.title, 'Test issue #2') + + # Add a comment to an issue + issue = pagure.lib.search_issues(self.session, repo, issueid=1) + msg = pagure.lib.add_issue_comment( + session=self.session, + issue=issue, + comment='Hey look a comment!', + user='foo', + ticketfolder=None + ) + self.session.commit() + self.assertEqual(msg, 'Comment added') + + # add pull-requests + req = pagure.lib.new_pull_request( + session=self.session, + repo_from=repo, + branch_from='feature', + repo_to=repo, + branch_to='master', + title='test pull-request', + user='pingou', + requestfolder=os.path.join(self.path, 'requests'), + ) + self.session.commit() + self.assertEqual(req.id, 3) + self.assertEqual(req.title, 'test pull-request') + + req = pagure.lib.new_pull_request( + session=self.session, + repo_from=repo, + branch_from='feature2', + repo_to=repo, + branch_to='master', + title='test pull-request', + user='pingou', + requestfolder=os.path.join(self.path, 'requests'), + ) + self.session.commit() + self.assertEqual(req.id, 4) + self.assertEqual(req.title, 'test pull-request') + + # Add comment on a pull-request + request = pagure.lib.search_pull_requests( + self.session, requestid=3) + + msg = pagure.lib.add_pull_request_comment( + session=self.session, + request=request, + commit='commithash', + tree_id=None, + filename='file', + row=None, + comment='This is awesome, I got to remember it!', + user='foo', + requestfolder=None, + ) + self.assertEqual(msg, 'Comment added') # Check before deleting the project output = self.app.get('/') @@ -2849,87 +2850,89 @@ index 0000000..fb7093d 'Forks 0', output.data) - # add issues - repo = pagure.get_authorized_project(self.session, 'test') - msg = pagure.lib.new_issue( - session=self.session, - repo=repo, - title='Test issue', - content='We should work on this', - user='pingou', - ticketfolder=os.path.join(self.path, 'tickets') - ) - self.session.commit() - self.assertEqual(msg.title, 'Test issue') - - msg = pagure.lib.new_issue( - session=self.session, - repo=repo, - title='Test issue #2', - content='We should work on this, really', - user='pingou', - ticketfolder=os.path.join(self.path, 'tickets') - ) - self.session.commit() - self.assertEqual(msg.title, 'Test issue #2') - - # Add a comment to an issue - issue = pagure.lib.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.add_issue_comment( - session=self.session, - issue=issue, - comment='Hey look a comment!', - user='foo', - ticketfolder=None - ) - self.session.commit() - self.assertEqual(msg, 'Comment added') - - # add pull-requests - req = pagure.lib.new_pull_request( - session=self.session, - repo_from=repo, - branch_from='feature', - repo_to=repo, - branch_to='master', - title='test pull-request', - user='pingou', - requestfolder=os.path.join(self.path, 'requests'), - ) - self.session.commit() - self.assertEqual(req.id, 3) - self.assertEqual(req.title, 'test pull-request') - - req = pagure.lib.new_pull_request( - session=self.session, - repo_from=repo, - branch_from='feature2', - repo_to=repo, - branch_to='master', - title='test pull-request', - user='pingou', - requestfolder=os.path.join(self.path, 'requests'), - ) - self.session.commit() - self.assertEqual(req.id, 4) - self.assertEqual(req.title, 'test pull-request') - - # Add comment on a pull-request - request = pagure.lib.search_pull_requests( - self.session, requestid=3) - - msg = pagure.lib.add_pull_request_comment( - session=self.session, - request=request, - commit='commithash', - tree_id=None, - filename='file', - row=None, - comment='This is awesome, I got to remember it!', - user='foo', - requestfolder=None, - ) - self.assertEqual(msg, 'Comment added') + # This part of the code calls lib stuff directly + with patch('pagure.ensure_lock'): + # add issues + repo = pagure.get_authorized_project(self.session, 'test') + msg = pagure.lib.new_issue( + session=self.session, + repo=repo, + title='Test issue', + content='We should work on this', + user='pingou', + ticketfolder=os.path.join(self.path, 'tickets') + ) + self.session.commit() + self.assertEqual(msg.title, 'Test issue') + + msg = pagure.lib.new_issue( + session=self.session, + repo=repo, + title='Test issue #2', + content='We should work on this, really', + user='pingou', + ticketfolder=os.path.join(self.path, 'tickets') + ) + self.session.commit() + self.assertEqual(msg.title, 'Test issue #2') + + # Add a comment to an issue + issue = pagure.lib.search_issues(self.session, repo, issueid=1) + msg = pagure.lib.add_issue_comment( + session=self.session, + issue=issue, + comment='Hey look a comment!', + user='foo', + ticketfolder=None + ) + self.session.commit() + self.assertEqual(msg, 'Comment added') + + # add pull-requests + req = pagure.lib.new_pull_request( + session=self.session, + repo_from=repo, + branch_from='feature', + repo_to=repo, + branch_to='master', + title='test pull-request', + user='pingou', + requestfolder=os.path.join(self.path, 'requests'), + ) + self.session.commit() + self.assertEqual(req.id, 3) + self.assertEqual(req.title, 'test pull-request') + + req = pagure.lib.new_pull_request( + session=self.session, + repo_from=repo, + branch_from='feature2', + repo_to=repo, + branch_to='master', + title='test pull-request', + user='pingou', + requestfolder=os.path.join(self.path, 'requests'), + ) + self.session.commit() + self.assertEqual(req.id, 4) + self.assertEqual(req.title, 'test pull-request') + + # Add comment on a pull-request + request = pagure.lib.search_pull_requests( + self.session, requestid=3) + + msg = pagure.lib.add_pull_request_comment( + session=self.session, + request=request, + commit='commithash', + tree_id=None, + filename='file', + row=None, + comment='This is awesome, I got to remember it!', + user='foo', + requestfolder=None, + ) + self.assertEqual(msg, 'Comment added') # Check before deleting the project output = self.app.get('/') @@ -3032,16 +3035,17 @@ index 0000000..fb7093d 'Forks 0', output.data) - # add user - repo = pagure.get_authorized_project(self.session, 'test') - msg = pagure.lib.add_user_to_project( - session=self.session, - project=repo, - new_user='foo', - user='pingou', - ) - self.session.commit() - self.assertEqual(msg, 'User added') + with patch('pagure.ensure_lock'): + # add user + repo = pagure.get_authorized_project(self.session, 'test') + msg = pagure.lib.add_user_to_project( + session=self.session, + project=repo, + new_user='foo', + user='pingou', + ) + self.session.commit() + self.assertEqual(msg, 'User added') # Check before deleting the project output = self.app.get('/') @@ -3112,34 +3116,35 @@ index 0000000..fb7093d 'Forks 0', output.data) - # Create group - msg = pagure.lib.add_group( - self.session, - group_name='foo', - display_name='foo group', - description=None, - group_type='bar', - user='pingou', - is_admin=False, - blacklist=[], - ) - self.session.commit() - self.assertEqual(msg, 'User `pingou` added to the group `foo`.') - - # Add group to the project - repo = pagure.get_authorized_project(self.session, 'test') - msg = pagure.lib.add_group_to_project( - session=self.session, - project=repo, - new_group='foo', - user='pingou', - ) - self.session.commit() - self.assertEqual(msg, 'Group added') - - # check if group where we expect it - repo = pagure.get_authorized_project(self.session, 'test') - self.assertEqual(len(repo.projects_groups), 1) + with patch('pagure.ensure_lock'): + # Create group + msg = pagure.lib.add_group( + self.session, + group_name='foo', + display_name='foo group', + description=None, + group_type='bar', + user='pingou', + is_admin=False, + blacklist=[], + ) + self.session.commit() + self.assertEqual(msg, 'User `pingou` added to the group `foo`.') + + # Add group to the project + repo = pagure.get_authorized_project(self.session, 'test') + msg = pagure.lib.add_group_to_project( + session=self.session, + project=repo, + new_group='foo', + user='pingou', + ) + self.session.commit() + self.assertEqual(msg, 'Group added') + + # check if group where we expect it + repo = pagure.get_authorized_project(self.session, 'test') + self.assertEqual(len(repo.projects_groups), 1) # Check before deleting the project output = self.app.get('/') @@ -3206,30 +3211,31 @@ index 0000000..fb7093d 'Forks 0', output.data) - # Create the issue - repo = pagure.get_authorized_project(self.session, 'test') - msg = pagure.lib.new_issue( - session=self.session, - repo=repo, - title='Test issue', - content='We should work on this', - user='pingou', - ticketfolder=os.path.join(self.path, 'tickets') - ) - self.session.commit() - self.assertEqual(msg.title, 'Test issue') - - # Add a tag to the issue - repo = pagure.get_authorized_project(self.session, 'test') - issue = pagure.lib.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.add_tag_obj( - session=self.session, - obj=issue, - tags='tag1', - user='pingou', - ticketfolder=None) - self.session.commit() - self.assertEqual(msg, 'Issue tagged with: tag1') + with patch('pagure.ensure_lock'): + # Create the issue + repo = pagure.get_authorized_project(self.session, 'test') + msg = pagure.lib.new_issue( + session=self.session, + repo=repo, + title='Test issue', + content='We should work on this', + user='pingou', + ticketfolder=os.path.join(self.path, 'tickets') + ) + self.session.commit() + self.assertEqual(msg.title, 'Test issue') + + # Add a tag to the issue + repo = pagure.get_authorized_project(self.session, 'test') + issue = pagure.lib.search_issues(self.session, repo, issueid=1) + msg = pagure.lib.add_tag_obj( + session=self.session, + obj=issue, + tags='tag1', + user='pingou', + ticketfolder=None) + self.session.commit() + self.assertEqual(msg, 'Issue tagged with: tag1') # Check before deleting the project output = self.app.get('/') diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index 604aff3..f87659c 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -1298,8 +1298,9 @@ index 9f44358..2a552bb 100644 patch = '\n'.join(npatch) self.assertEqual(patch, exp) + @patch('pagure.ensure_lock') @patch('pagure.lib.notify.send_email') - def test_update_git(self, email_f): + def test_update_git(self, elock, email_f): """ Test the update_git of pagure.lib.git. """ email_f.return_value = True @@ -1517,7 +1518,8 @@ index 458821a..77674a8 #print patch self.assertEqual(patch, exp) - def test_clean_git(self): + @patch('pagure.ensure_lock') + def test_clean_git(self, elock): """ Test the clean_git method of pagure.lib.git. """ pagure.lib.git.clean_git(None, None, None) @@ -1548,8 +1550,9 @@ index 458821a..77674a8 files = [entry.name for entry in commit.tree] self.assertEqual(files, []) + @patch('pagure.ensure_lock') @patch('pagure.lib.notify.send_email') - def test_update_git_requests(self, email_f): + def test_update_git_requests(self, elock, email_f): """ Test the update_git of pagure.lib.git for pull-requests. """ email_f.return_value = True @@ -2390,7 +2393,8 @@ index 0000000..60f7480 'test request to namespaced repo' ) - def test_read_git_lines(self): + @patch('pagure.ensure_lock') + def test_read_git_lines(self, elock): """ Test the read_git_lines method of pagure.lib.git. """ self.test_update_git() @@ -2413,7 +2417,8 @@ index 0000000..60f7480 output[0].endswith(": Test issue'\n") ) - def test_get_revs_between(self): + @patch('pagure.ensure_lock') + def test_get_revs_between(self, elock): """ Test the get_revs_between method of pagure.lib.git. """ self.test_update_git() @@ -2480,7 +2485,8 @@ index 0000000..60f7480 '0', branch_commit.oid.hex, gitrepo, 'refs/heads/feature') self.assertEqual(output4, [branch_commit.oid.hex]) - def test_get_author(self): + @patch('pagure.ensure_lock') + def test_get_author(self, elock): """ Test the get_author method of pagure.lib.git. """ self.test_update_git()