diff --git a/tests/test_pagure_exclude_group_index.py b/tests/test_pagure_exclude_group_index.py index 295de5a..37cf7d3 100644 --- a/tests/test_pagure_exclude_group_index.py +++ b/tests/test_pagure_exclude_group_index.py @@ -21,6 +21,7 @@ import mock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import pagure.lib.model import tests @@ -52,7 +53,7 @@ class PagureExcludeGroupIndex(tests.Modeltests): msg, 'User `pingou` added to the group `provenpackager`.') # Add the `provenpackager` group to the test2 project - project = pagure.lib.get_project(self.session, 'test2') + project = pagure.get_authorized_project(self.session, 'test2') msg = pagure.lib.add_group_to_project( session=self.session, project=project, diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index eb81126..82c3ebe 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -1997,6 +1997,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): '/api/0/test/issue/1/status', data=data, headers=headers) self.assertEqual(output.status_code, 200) data = json.loads(output.data) + self.assertDictEqual( data, {'message':[ diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py index 183fede..b08cc14 100644 --- a/tests/test_pagure_flask_api_ui_private_repo.py +++ b/tests/test_pagure_flask_api_ui_private_repo.py @@ -884,7 +884,7 @@ class PagurePrivateRepotest(tests.Modeltests): output = pagure.lib.update_tags( self.session, repo, 'infra', 'pingou', ticketfolder=None) - self.assertEqual(output, ['Tag added: infra']) + self.assertEqual(output, ['Issue tagged with: infra']) # Check after adding repo = pagure.lib._get_project(self.session, 'test4') @@ -2483,7 +2483,10 @@ class PagurePrivateRepotest(tests.Modeltests): data = json.loads(output.get_data(as_text=True)) self.assertDictEqual( data, - {'message': 'Successfully edited issue #1'} + {'message':[ + 'Issue status updated to: Closed (was: Open)', + 'Issue close_status updated to: Fixed' + ]} ) @patch('pagure.lib.git.update_git') diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 05eea20..f72770b 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -569,7 +569,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertIn('Deploy key does not exist in project', output.data) # Add a deploy key to a project - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.add_deploykey_to_project( session=self.session, project=repo, diff --git a/tests/test_pagure_lib_drop_issue.py b/tests/test_pagure_lib_drop_issue.py index 56a103b..abc9965 100644 --- a/tests/test_pagure_lib_drop_issue.py +++ b/tests/test_pagure_lib_drop_issue.py @@ -21,6 +21,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import pagure.lib.model import tests @@ -42,7 +43,7 @@ class PagureLibDropIssuetests(tests.Modeltests): tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Before issues = pagure.lib.search_issues(self.session, repo) @@ -92,7 +93,7 @@ class PagureLibDropIssuetests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( str(repo.tags_colored), '[TagColored(id: 1, tag:red, tag_description:red tag, color:#ff0000)]' @@ -110,7 +111,7 @@ class PagureLibDropIssuetests(tests.Modeltests): p_send_email.return_value = True p_ugt.return_value = True - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add tag to the second issue issue = pagure.lib.search_issues(self.session, repo, issueid=2) @@ -125,7 +126,7 @@ class PagureLibDropIssuetests(tests.Modeltests): self.assertEqual(msgs, ['Issue tagged with: red']) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 2) issue = pagure.lib.search_issues(self.session, repo, issueid=2) self.assertEqual( @@ -139,7 +140,7 @@ class PagureLibDropIssuetests(tests.Modeltests): self.session, issue, user='pingou', ticketfolder=None) self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 1) @patch('pagure.lib.git.update_git') @@ -154,7 +155,7 @@ class PagureLibDropIssuetests(tests.Modeltests): p_send_email.return_value = True p_ugt.return_value = True - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add the tag to both issues issue = pagure.lib.search_issues(self.session, repo, issueid=1) @@ -179,7 +180,7 @@ class PagureLibDropIssuetests(tests.Modeltests): self.session.commit() self.assertEqual(msgs, ['Issue tagged with: red']) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 2) issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( @@ -198,7 +199,7 @@ class PagureLibDropIssuetests(tests.Modeltests): self.session, issue, user='pingou', ticketfolder=None) self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 1) issue = pagure.lib.search_issues(self.session, repo, issueid=1) diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index c731eda..6a38c0f 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -159,7 +159,7 @@ repo requests/forks/pingou/test3 """ Test write_gitolite_acls function to add deploy keys. """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add two deploy keys (one readonly one push) msg1 = pagure.lib.add_deploykey_to_project( session=self.session,