From bc7d719780dcd3c64e93f81b96175b8896bb323d Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Aug 11 2016 13:24:50 +0000 Subject: Fix test for private-repo and rename get_project to _get_project The renaming is done on puiterwijk concern for open-points for get_project. This is done so any function or component using it will stop function as it should use get_authorized_project instead. The test for private-repo still has _get_project because getting a user authenticated demands to have an active request which is not possible while testing the component. --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 252d60b..8b45e7b 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -311,7 +311,7 @@ def get_authorized_project(session, repo, user=None): if repo is private and user is authorized to view repo object is returned else None """ - repo = pagure.lib.get_project(session, repo, user) + repo = pagure.lib._get_project(session, repo, user) if repo and repo.private and not is_repo_admin(repo): return None diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index eb84222..e0e2679 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -74,7 +74,6 @@ class APIERROR(enum.Enum): ENOCOMMENT = 'Comment not found' ENEWPROJECTDISABLED = 'Creating project have been disabled for this '\ 'instance' - EPROJECTNOTALLOWED = 'You are not allowed to view this project' def check_api_acls(acls, optional=False): diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 55ecd55..6734fc8 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -1613,7 +1613,7 @@ def search_projects( return query.all() -def get_project(session, name, user=None): +def _get_project(session, name, user=None): '''Get a project from the database ''' query = session.query( diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py index cdadf0e..4a7adec 100644 --- a/tests/test_pagure_flask_api_ui_private_repo.py +++ b/tests/test_pagure_flask_api_ui_private_repo.py @@ -187,7 +187,7 @@ class PagurePrivateRepotest(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.get_project(self.session, 'pmc') + project = pagure.lib._get_project(self.session, 'pmc') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -343,7 +343,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual( output.get_data(as_text=True).count('
'), 3) - repo = pagure.lib.get_project(self.session, 'test3') + repo = pagure.lib._get_project(self.session, 'test3') msg = pagure.lib.add_user_to_project( session=self.session, @@ -434,7 +434,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.get_project(self.session, 'pmc') + repo = pagure.lib._get_project(self.session, 'pmc') msg = pagure.lib.add_user_to_project( session=self.session, @@ -470,7 +470,7 @@ class PagurePrivateRepotest(tests.Modeltests): output.get_data(as_text=True)) self.set_up_git_repo(new_project=None, branch_from='feature') - project = pagure.lib.get_project(self.session, 'pmc') + project = pagure.lib._get_project(self.session, 'pmc') self.assertEqual(len(project.requests), 1) output = self.app.get('/pmc/pull-request/1') @@ -523,7 +523,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -568,7 +568,7 @@ class PagurePrivateRepotest(tests.Modeltests): output = self.app.get('/test4/issue/1') self.assertEqual(output.status_code, 200) - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') msg = pagure.lib.add_user_to_project( session=self.session, @@ -691,7 +691,7 @@ class PagurePrivateRepotest(tests.Modeltests): shutil.rmtree(newpath) # Check before adding - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') self.assertEqual(repo.tags, []) # Adding a tag @@ -701,7 +701,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(output, ['Tag added: infra']) # Check after adding - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) @@ -805,8 +805,8 @@ class PagurePrivateRepotest(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test4') - forked_repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') + forked_repo = pagure.lib._get_project(self.session, 'test4') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -1008,8 +1008,8 @@ class PagurePrivateRepotest(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test4') - forked_repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') + forked_repo = pagure.lib._get_project(self.session, 'test4') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -1144,8 +1144,8 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test4') - forked_repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') + forked_repo = pagure.lib._get_project(self.session, 'test4') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -1273,8 +1273,8 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.commit() # Create the pull-request to close - repo = pagure.lib.get_project(self.session, 'test4') - forked_repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') + forked_repo = pagure.lib._get_project(self.session, 'test4') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -1407,8 +1407,8 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.commit() # Create the pull-request to close - repo = pagure.lib.get_project(self.session, 'test4') - forked_repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') + forked_repo = pagure.lib._get_project(self.session, 'test4') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -1671,7 +1671,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create private issue - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2072,7 +2072,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2086,7 +2086,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check status before - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -2110,7 +2110,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -2129,7 +2129,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -2208,7 +2208,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2223,7 +2223,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check comments before - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -2245,7 +2245,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -2264,7 +2264,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) # One comment added - repo = pagure.lib.get_project(self.session, 'test4') + repo = pagure.lib._get_project(self.session, 'test4') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1)