From 653d00dcf0d4cb1a30965bffdbecfdcd97bc67f4 Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Aug 11 2016 13:24:37 +0000 Subject: Replace get_project to get_authorized_project This is done so that no project should use get_project since it is the direct way to get all the project. There is a level of filtering that get_authorized project provides which is necessary so the information regarding private repo shouldn't be leaked. --- diff --git a/dev-data.py b/dev-data.py index 5dfceb9..923057a 100644 --- a/dev-data.py +++ b/dev-data.py @@ -251,7 +251,7 @@ def insert_data(session, username, user_email): # projects_groups group = pagure.lib.search_groups(session, pattern=None, group_name="rel-eng", group_type=None) - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') item = pagure.lib.model.ProjectGroup( project_id=repo.id, group_id=group.id @@ -261,7 +261,7 @@ def insert_data(session, username, user_email): group = pagure.lib.search_groups(session, pattern=None, group_name="admin", group_type=None) - repo = pagure.lib.get_project(session, 'test2') + repo = pagure.get_authorized_project(session, 'test2') item = pagure.lib.model.ProjectGroup( project_id=repo.id, group_id=group.id @@ -271,8 +271,8 @@ def insert_data(session, username, user_email): ###################################### # pull_requests - repo = pagure.lib.get_project(session, 'test') - forked_repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') + forked_repo = pagure.get_authorized_project(session, 'test') req = pagure.lib.new_pull_request( session=session, repo_from=forked_repo, @@ -292,7 +292,7 @@ def insert_data(session, username, user_email): ###################################### # user_projects user = pagure.lib.search_user(session, username='foo') - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') item = pagure.lib.model.ProjectUser( project_id=repo.id, user_id=user.id @@ -301,7 +301,7 @@ def insert_data(session, username, user_email): session.commit() user = pagure.lib.search_user(session, username=username) - repo = pagure.lib.get_project(session, 'test2') + repo = pagure.get_authorized_project(session, 'test2') item = pagure.lib.model.ProjectUser( project_id=repo.id, user_id=user.id @@ -321,8 +321,7 @@ def insert_data(session, username, user_email): ###################################### # issue_to_issue - repo = pagure.lib.get_project(session, 'test') - + repo = pagure.get_authorized_project(session, 'test') all_issues = pagure.lib.search_issues(session, repo) pagure.lib.add_issue_dependency(session, all_issues[0], all_issues[1], 'pingou', @@ -361,7 +360,7 @@ def insert_data(session, username, user_email): ###################################### # tags_issues - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') issues = pagure.lib.search_issues(session, repo) item = pagure.lib.model.TagIssue( issue_uid=issues[0].uid, @@ -402,7 +401,7 @@ def insert_data(session, username, user_email): except: print('requests folder already deleted') - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') result = pagure.lib.fork_project(session, 'foo', repo, pagure.APP.config['GIT_FOLDER'], pagure.APP.config['DOCS_FOLDER'], diff --git a/ev-server/pagure-stream-server.py b/ev-server/pagure-stream-server.py index 746de60..493bfb0 100644 --- a/ev-server/pagure-stream-server.py +++ b/ev-server/pagure-stream-server.py @@ -54,7 +54,7 @@ def get_obj_from_path(path): except: raise PagureEvException("Invalid URL: %s" % path) - repo = pagure.lib.get_project(pagure.SESSION, repo, user=username) + repo = pagure.get_authorized_project(pagure.SESSION, repo, user=username) if repo is None: raise PagureEvException("Project '%s' not found" % repo) diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index 5ea781f..eb84222 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -329,7 +329,7 @@ def api_project_tags(repo, username=None): if pattern is not None and not pattern.endswith('*'): pattern += '*' - project_obj = pagure.lib.get_project(SESSION, repo, username) + project_obj = pagure.get_authorized_project(SESSION, repo, username) if not project_obj: output = {'output': 'notok', 'error': 'Project not found'} jsonout = flask.jsonify(output) diff --git a/pagure/api/issue.py b/pagure/api/issue.py index 3a57e66..eaaa7e3 100644 --- a/pagure/api/issue.py +++ b/pagure/api/issue.py @@ -682,7 +682,7 @@ def api_assign_issue(repo, issueid, username=None): } """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = pagure.get_authorized_project(SESSION, repo, user=username) output = {} if repo is None: diff --git a/pagure/api/project.py b/pagure/api/project.py index 23160aa..6d3410a 100644 --- a/pagure/api/project.py +++ b/pagure/api/project.py @@ -318,7 +318,7 @@ def api_fork_project(): repo = form.repo.data username = form.username.data or None - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = pagure.get_authorized_project(SESSION, repo, user=username) if repo is None: raise pagure.exceptions.APIError( 404, error_code=APIERROR.ENOPROJECT) diff --git a/pagure/docs_server.py b/pagure/docs_server.py index dad385e..05bbf2e 100644 --- a/pagure/docs_server.py +++ b/pagure/docs_server.py @@ -14,6 +14,7 @@ import os import flask import pygit2 +import pagure import pagure.doc_utils import pagure.exceptions import pagure.lib @@ -121,7 +122,7 @@ def view_docs(repo, username=None, filename=None): """ Display the documentation """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = pagure.get_authorized_project(SESSION, repo, user=username) if not repo: flask.abort(404, 'Project not found') diff --git a/pagure/hooks/files/fedmsg_hook.py b/pagure/hooks/files/fedmsg_hook.py index 9a1d73c..a084758 100755 --- a/pagure/hooks/files/fedmsg_hook.py +++ b/pagure/hooks/files/fedmsg_hook.py @@ -52,7 +52,7 @@ for line in sys.stdin.readlines(): oldrev, newrev, abspath, refname, forced=forced) project_name = pagure.lib.git.get_repo_name(abspath) username = pagure.lib.git.get_username(abspath) - project = pagure.lib.get_project(pagure.SESSION, project_name, username) + project = pagure.get_authorized_project(pagure.SESSION, project_name, username) if not project: project = project_name diff --git a/pagure/hooks/files/pagure_force_commit_hook.py b/pagure/hooks/files/pagure_force_commit_hook.py index a1bacd4..a9e0bac 100755 --- a/pagure/hooks/files/pagure_force_commit_hook.py +++ b/pagure/hooks/files/pagure_force_commit_hook.py @@ -32,7 +32,7 @@ def run_as_pre_receive_hook(): print 'repo:', reponame print 'user:', username - repo = pagure.lib.get_project(pagure.SESSION, reponame, user=username) + repo = pagure.get_authorized_project(pagure.SESSION, reponame, user=username) if not repo: print 'Unknown repo %s of username: %s' % (reponame, username) sys.exit(1) diff --git a/pagure/hooks/files/rtd_hook.py b/pagure/hooks/files/rtd_hook.py index 98525c6..aab9e79 100755 --- a/pagure/hooks/files/rtd_hook.py +++ b/pagure/hooks/files/rtd_hook.py @@ -33,7 +33,7 @@ def run_as_post_receive_hook(): print 'repo:', reponame print 'user:', username - repo = pagure.lib.get_project(pagure.SESSION, reponame, user=username) + repo = pagure.get_authorized_project(pagure.SESSION, reponame, user=username) if not repo: print 'Unknown repo %s of username: %s' % (reponame, username) sys.exit(1) diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index 6185d77..19d0a7a 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -250,7 +250,7 @@ def get_pull_request_ready_branch(): response.status_code = 400 return response - repo = pagure.lib.get_project( + repo = pagure.get_authorized_project( pagure.SESSION, flask.request.form.get('repo', '').strip() or None, user=flask.request.form.get('repouser', '').strip() or None) @@ -356,7 +356,7 @@ def get_ticket_template(repo, username=None): response.status_code = 400 return response - repo = pagure.lib.get_project(pagure.SESSION, repo, user=username) + repo = pagure.get_authorized_project(pagure.SESSION, repo, user=username) if repo is None: response = flask.jsonify({ @@ -425,7 +425,7 @@ def get_branches_of_commit(): response.status_code = 400 return response - repo = pagure.lib.get_project( + repo = pagure.get_authorized_project( pagure.SESSION, flask.request.form.get('repo', '').strip() or None, user=flask.request.form.get('repouser', '').strip() or None) diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 303ee5c..55ecd55 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -38,6 +38,7 @@ from sqlalchemy.exc import SQLAlchemyError import pygit2 +import pagure import pagure.exceptions import pagure.lib.git import pagure.lib.login @@ -2913,7 +2914,7 @@ def is_watching(session, user, reponame, repouser=None): if watcher: return watcher.watch - project = pagure.lib.get_project(session, reponame, user=repouser) + project = pagure.get_authorized_project(session, reponame, user=repouser) if not project: return False diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 524b1c3..c70b5c1 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -361,7 +361,7 @@ def get_project_from_json( project_user = None if jsondata.get('parent'): project_user = user.username - project = pagure.lib.get_project(session, name, user=project_user) + project = pagure.get_authorized_project(session, name, user=project_user) if not project: parent = None @@ -397,7 +397,7 @@ def get_project_from_json( ) session.commit() - project = pagure.lib.get_project(session, name, user=user.username) + project = pagure.get_authorized_project(session, name, user=user.username) tags = jsondata.get('tags', None) if tags: pagure.lib.add_tag_obj( @@ -420,7 +420,7 @@ def update_ticket_from_git( """ - repo = pagure.lib.get_project(session, reponame, user=username) + repo = pagure.get_authorized_project(session, reponame, user=username) if not repo: raise pagure.exceptions.PagureException( 'Unknown repo %s of username: %s' % (reponame, username)) @@ -520,7 +520,7 @@ def update_request_from_git( """ - repo = pagure.lib.get_project(session, reponame, user=username) + repo = pagure.get_authorized_project(session, reponame, user=username) if not repo: raise pagure.exceptions.PagureException( 'Unknown repo %s of username: %s' % (reponame, username)) diff --git a/pagure/lib/link.py b/pagure/lib/link.py index 6cdf46d..2ad85f4 100644 --- a/pagure/lib/link.py +++ b/pagure/lib/link.py @@ -10,7 +10,7 @@ import re - +import pagure import pagure.exceptions @@ -49,7 +49,7 @@ def get_relation(session, reponame, username, text, reftype='relates', ''' - repo = pagure.lib.get_project(session, reponame, user=username) + repo = pagure.get_authorized_project(session, reponame, user=username) if not repo: return [] diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py index 9068b6a..207ffe3 100644 --- a/pagure/pfmarkdown.py +++ b/pagure/pfmarkdown.py @@ -207,8 +207,8 @@ def makeExtension(*arg, **kwargs): def _issue_exists(user, repo, idx): """ Utility method checking if a given issue exists. """ - repo_obj = pagure.lib.get_project( - pagure.SESSION, name=repo, user=user) + repo_obj = pagure.get_authorized_project( + pagure.SESSION, repo=repo, user=user) if not repo_obj: return False @@ -222,8 +222,8 @@ def _issue_exists(user, repo, idx): def _pr_exists(user, repo, idx): """ Utility method checking if a given PR exists. """ - repo_obj = pagure.lib.get_project( - pagure.SESSION, name=repo, user=user) + repo_obj = pagure.get_authorized_project( + pagure.SESSION, repo=repo, user=user) if not repo_obj: return False diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py index cf478c1..9aae98a 100644 --- a/pagure/ui/plugins.py +++ b/pagure/ui/plugins.py @@ -74,7 +74,7 @@ def get_plugin(plugin_name): def view_plugin(repo, plugin, username=None, full=True): """ Presents the settings of the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = pagure.get_authorized_project(SESSION, repo, user=username) if not repo: flask.abort(404, 'Project not found') diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index f42e6d8..66cbd2e 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -382,7 +382,7 @@ def view_commits(repo, branchname=None, username=None): def compare_commits(repo, commit1, commit2, username=None): """ Compares two commits for specified repo """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = get_authorized_project(SESSION, repo, user=username) if not repo: flask.abort(404, 'Project not found') @@ -1986,9 +1986,9 @@ def watch_repo(repo, watch, user=None): flask.abort(400) username = flask.g.fas_user.username - repo_obj = pagure.lib.get_project(SESSION, repo) + repo_obj = get_authorized_project(SESSION, repo) if user is not None: - repo_obj = pagure.lib.get_project(SESSION, repo, user) + repo_obj = get_authorized_project(SESSION, repo, user) if not repo_obj: flask.abort(404, 'Project not found') diff --git a/tests/test_pagure_flask_api_fork.py b/tests/test_pagure_flask_api_fork.py index bce8e20..0c69e43 100644 --- a/tests/test_pagure_flask_api_fork.py +++ b/tests/test_pagure_flask_api_fork.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -54,8 +55,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -176,8 +177,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -301,8 +302,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -415,8 +416,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -569,8 +570,8 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -683,8 +684,8 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index b1324ab..fab44db 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -179,7 +180,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create private issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -500,7 +501,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create private issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -669,7 +670,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -711,7 +712,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') # Create private issue msg = pagure.lib.new_issue( session=self.session, @@ -726,7 +727,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Check status before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -748,7 +749,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -767,7 +768,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -852,7 +853,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -867,7 +868,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check comments before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -889,7 +890,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -908,7 +909,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # One comment added - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) @@ -942,7 +943,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') # Create private issue msg = pagure.lib.new_issue( session=self.session, @@ -958,7 +959,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Check before - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -982,7 +983,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No comment added - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -1178,7 +1179,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1193,7 +1194,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check comments before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -1215,7 +1216,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -1234,7 +1235,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # One comment added - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.assignee.user, 'pingou') @@ -1268,7 +1269,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') # Create private issue msg = pagure.lib.new_issue( session=self.session, @@ -1284,7 +1285,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Check before - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -1308,7 +1309,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No comment added - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py index 9963cda..afbc078 100644 --- a/tests/test_pagure_flask_api_project.py +++ b/tests/test_pagure_flask_api_project.py @@ -117,7 +117,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): tests.create_projects(self.session) # Check before adding - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.tags, []) # Adding a tag @@ -127,7 +127,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertEqual(output, ['Tag added: infra']) # Check after adding - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index e537def..e1214e3 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.docs_server import pagure.lib import tests @@ -75,7 +76,7 @@ class PagureFlaskDocstests(tests.Modeltests): tests.create_projects(self.session) # Turn on the docs project since it's off by default - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'project_documentation': True} self.session.add(repo) self.session.commit() @@ -95,7 +96,7 @@ class PagureFlaskDocstests(tests.Modeltests): docs. """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') tests.create_projects_git(os.path.join(tests.HERE, 'docs')) output = self.app.get('/test/docs') @@ -158,7 +159,7 @@ class PagureFlaskDocstests(tests.Modeltests): PagureRepo.push(remote, 'refs/heads/master:refs/heads/master') # Turn on the docs project since it's off by default - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'project_documentation': True} self.session.add(repo) self.session.commit() diff --git a/tests/test_pagure_flask_dump_load_ticket.py b/tests/test_pagure_flask_dump_load_ticket.py index 4b585b3..2c20c7c 100644 --- a/tests/test_pagure_flask_dump_load_ticket.py +++ b/tests/test_pagure_flask_dump_load_ticket.py @@ -24,6 +24,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -68,7 +69,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): os.makedirs(self.gitrepo) repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Create an issue to play with msg = pagure.lib.new_issue( session=self.session, @@ -213,7 +214,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): ) # Post loading - 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_flask_internal.py b/tests/test_pagure_flask_internal.py index effabc7..f364277 100644 --- a/tests/test_pagure_flask_internal.py +++ b/tests/test_pagure_flask_internal.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -56,7 +57,7 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, @@ -118,7 +119,7 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.data) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') request = repo.requests[0] self.assertEqual(len(request.comments), 1) self.assertEqual(len(request.discussion), 1) @@ -136,7 +137,7 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -193,7 +194,7 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.data) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 1) @@ -210,7 +211,7 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -277,7 +278,7 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.data) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 1) @@ -353,7 +354,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -392,7 +393,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -475,7 +476,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -514,7 +515,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -618,7 +619,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -655,7 +656,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -759,7 +760,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -796,7 +797,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index c82e550..9449cb6 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -24,6 +24,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -206,7 +207,7 @@ class PagureFlaskForktests(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -242,7 +243,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) # View the pull-request @@ -310,7 +311,7 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -344,7 +345,7 @@ class PagureFlaskForktests(tests.Modeltests): 'assigned to be merged', output.data) # PR assigned but not to this user - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') req = repo.requests[0] req.assignee_id = 2 self.session.add(req) @@ -558,7 +559,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -625,7 +626,7 @@ class PagureFlaskForktests(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -686,7 +687,7 @@ class PagureFlaskForktests(tests.Modeltests): # Create a PR for these "changes" (there are none, both repos are # empty) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -780,7 +781,7 @@ class PagureFlaskForktests(tests.Modeltests): 'href="/test/pull-requests?status=0">Closed', output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -853,7 +854,7 @@ index 9f44358..2a552bb 100644 self.assertEqual(patch, exp) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -966,7 +967,7 @@ index 9f44358..2a552bb 100644 # Create a PR for these "changes" (there are none, both repos are # empty) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -1056,7 +1057,7 @@ index 0000000..2a552bb # Create a PR for these "changes" (there are none, both repos are # empty) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -1135,7 +1136,7 @@ index 0000000..2a552bb user.username = 'pingou' with tests.user_set(pagure.APP, user): # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1147,7 +1148,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 404) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = True repo.settings = settings @@ -1272,7 +1273,7 @@ index 0000000..2a552bb output.data) # Pull-Request closed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') req = repo.requests[0] req.status = 'Closed' req.closed_by_in = 1 @@ -1285,7 +1286,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 403) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1354,8 +1355,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(tests.HERE, 'requests'), bare=True) - repo = pagure.lib.get_project(self.session, 'test') - fork = pagure.lib.get_project(self.session, 'test', user='foo') + repo = pagure.get_authorized_project(self.session, 'test') + fork = pagure.get_authorized_project(self.session, 'test', user='foo') self.set_up_git_repo( new_project=fork, branch_from='feature', mtype='FF') @@ -1444,8 +1445,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(tests.HERE, 'requests'), bare=True) - repo = pagure.lib.get_project(self.session, 'test') - fork = pagure.lib.get_project(self.session, 'test', user='foo') + repo = pagure.get_authorized_project(self.session, 'test') + fork = pagure.get_authorized_project(self.session, 'test', user='foo') # Create a git repo to play with gitrepo = os.path.join(tests.HERE, 'repos', 'test.git') @@ -1499,8 +1500,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(tests.HERE, 'requests'), bare=True) - repo = pagure.lib.get_project(self.session, 'test') - fork = pagure.lib.get_project(self.session, 'test', user='foo') + repo = pagure.get_authorized_project(self.session, 'test') + fork = pagure.get_authorized_project(self.session, 'test', user='foo') # Create a git repo to play with gitrepo = os.path.join(tests.HERE, 'repos', 'test.git') @@ -1565,7 +1566,7 @@ index 0000000..2a552bb output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1584,7 +1585,7 @@ index 0000000..2a552bb self.test_pull_request_add_comment() # Project w/ pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = True repo.settings = settings @@ -1646,7 +1647,7 @@ index 0000000..2a552bb output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1740,7 +1741,7 @@ index 0000000..2a552bb '\n Comment updated', output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1810,7 +1811,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 404) # Project requiring a merge commit - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['always_merge'] = True repo.settings = settings diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index 6907faa..c24db98 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -25,6 +25,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -138,7 +139,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -199,7 +200,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -243,7 +244,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

\n 0 Open Issues' in output.data) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -286,7 +287,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -321,7 +322,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -379,7 +380,7 @@ class PagureFlaskIssuestests(tests.Modeltests): 'name="csrf_token" type="hidden" value="')[1].split('">')[0] # Create private issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -419,7 +420,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -445,7 +446,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -651,7 +652,7 @@ class PagureFlaskIssuestests(tests.Modeltests): in output.data) # Create another issue with a dependency - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -696,7 +697,7 @@ class PagureFlaskIssuestests(tests.Modeltests): in output.data) # Create private issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -717,7 +718,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 403) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -742,7 +743,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(tests.HERE), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -792,7 +793,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

Woohoo a second comment !

' in output.data) self.assertEqual(output.data.count('comment_body">'), 2) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) @@ -836,7 +837,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 404) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -852,7 +853,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(tests.HERE), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -864,7 +865,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -930,7 +931,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '\n Dependency added', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depends_text, [2]) self.assertEqual(issue.blocks_text, []) @@ -947,7 +948,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(tests.HERE), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -959,7 +960,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1025,7 +1026,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '\n Dependency added', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depends_text, []) self.assertEqual(issue.blocks_text, [2]) @@ -1044,7 +1045,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(tests.HERE, 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1136,7 +1137,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertDictEqual(json_data, exp) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1153,7 +1154,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(tests.HERE, 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1177,7 +1178,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1191,7 +1192,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.test_upload_issue() # Project w/ issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': True} self.session.add(repo) self.session.commit() @@ -1212,7 +1213,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 200) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1248,7 +1249,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1324,7 +1325,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

We should work on this!

'), 1) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1355,7 +1356,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 403) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1444,7 +1445,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 403) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1513,7 +1514,7 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects_git(os.path.join(tests.HERE, 'tickets')) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1573,7 +1574,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1595,7 +1596,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(tests.HERE), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1645,7 +1646,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

Woohoo a second comment !

' in output.data) self.assertEqual(output.data.count('comment_body">'), 2) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual( @@ -1688,7 +1689,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '\n Comment updated', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Updated comment') @@ -1726,7 +1727,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '\n Comment updated', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Second update') @@ -1752,7 +1753,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

Issues GIT URLs
', output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': True} self.session.add(repo) self.session.commit() diff --git a/tests/test_pagure_flask_ui_priorities.py b/tests/test_pagure_flask_ui_priorities.py index 2e3de95..23e22be 100644 --- a/tests/test_pagure_flask_ui_priorities.py +++ b/tests/test_pagure_flask_ui_priorities.py @@ -25,6 +25,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -110,7 +111,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(tests.HERE), bare=True) # Set some priorities - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.priorities = {'1': 'High', '2': 'Normal'} self.session.add(repo) self.session.commit() @@ -156,7 +157,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(tests.HERE), bare=True) # Set some priorities - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -185,7 +186,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Settings - test - Pagure', output.data) self.assertIn('

Settings for test

', output.data) # Check the result of the action -- None, no CSRF - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) data = { @@ -201,7 +202,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Settings - test - Pagure', output.data) self.assertIn('

Settings for test

', output.data) # Check the result of the action -- Priority recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {u'': u'', u'1': u'High'}) data = { @@ -217,7 +218,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Settings - test - Pagure', output.data) self.assertIn('

Settings for test

', output.data) # Check the result of the action -- Priority recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -240,7 +241,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): '\n' ' Priorities weights and titles are ' 'not of the same length', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -264,7 +265,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): ' Priorities weights must be numbers', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -288,7 +289,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): ' Priority weight 2 is present 2 times', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -312,7 +313,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): ' Priority Normal is present 2 times', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 8d20941..55c842a 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -25,6 +25,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -340,7 +341,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Add an user to a project - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.add_user_to_project( session=self.session, project=repo, @@ -406,7 +407,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'loose it right', output.data) # Add an user to a project - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.add_user_to_project( session=self.session, project=repo, @@ -476,7 +477,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(msg, 'User `pingou` added to the group `testgrp`.') self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add the group to a project msg = pagure.lib.add_group_to_project( session=self.session, @@ -555,7 +556,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(msg, 'User `pingou` added to the group `testgrp`.') self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add the group to a project msg = pagure.lib.add_group_to_project( session=self.session, @@ -851,7 +852,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'test project #1 ', output.data) # Turn that repo into a fork - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.parent_id = 2 self.session.add(repo) self.session.commit() @@ -980,7 +981,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'test project #1 ', output.data) # Turn that repo into a fork - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.parent_id = 2 self.session.add(repo) self.session.commit() @@ -1073,7 +1074,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'test project #1 ', output.data) # Turn that repo into a fork - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.parent_id = 2 self.session.add(repo) self.session.commit() @@ -1962,7 +1963,7 @@ index 0000000..fb7093d output.data) # add issues - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2056,9 +2057,9 @@ index 0000000..fb7093d output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 404) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertNotEqual(repo, None) - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertNotEqual(repo, None) # Add a fork of a fork @@ -2205,7 +2206,7 @@ index 0000000..fb7093d output.data) # add issues - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2305,9 +2306,9 @@ index 0000000..fb7093d 'Forks 0', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo, None) - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertNotEqual(repo, None) # Add a fork of a fork @@ -2353,7 +2354,7 @@ index 0000000..fb7093d ast.return_value = False tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') user = tests.FakeUser() @@ -2379,7 +2380,7 @@ index 0000000..fb7093d pagure.APP.config['WEBHOOK'] = False - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') user.username = 'pingou' @@ -2390,7 +2391,7 @@ index 0000000..fb7093d data = {'csrf_token': csrf_token} - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') tests.create_projects_git(tests.HERE) @@ -2402,7 +2403,7 @@ index 0000000..fb7093d output.data) pagure.APP.config['WEBHOOK'] = False - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertNotEqual(repo.hook_token, 'aaabbbccc') @patch('pagure.lib.notify.send_email') @@ -2450,7 +2451,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 400) # Create an issue to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2472,7 +2473,7 @@ index 0000000..fb7093d output.data) # Create a request to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_pull_request( session=self.session, repo_from=repo, @@ -2946,7 +2947,7 @@ index 0000000..fb7093d output.data) # Existing token will expire in 60 days - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.tokens[0].expiration.date(), datetime.datetime.utcnow().date() + datetime.timedelta(days=60)) @@ -2963,7 +2964,7 @@ index 0000000..fb7093d output.data) # Existing token has been expired - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.tokens[0].expiration.date(), repo.tokens[0].created.date()) diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py index 9f514d6..9bd75fa 100644 --- a/tests/test_pagure_flask_ui_roadmap.py +++ b/tests/test_pagure_flask_ui_roadmap.py @@ -25,6 +25,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -108,7 +109,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): tests.create_projects_git(os.path.join(tests.HERE), bare=True) # Set some milestone - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.milestone = {'v1.0': '', 'v2.0': 'Tomorrow!'} self.session.add(repo) self.session.commit() @@ -171,7 +172,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): tests.create_projects_git(os.path.join(tests.HERE), bare=True) # Set some milestones - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {}) user = tests.FakeUser() @@ -200,7 +201,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): u'Settings - test - Pagure', output.data) self.assertIn('

Settings for test

', output.data) # Check the result of the action -- None, no CSRF - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {}) data = { @@ -217,7 +218,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn(u'

Settings for test

', output.data) self.assertIn(u'Milestones updated', output.data) # Check the result of the action -- Milestones recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {u'1': u'Tomorrow'}) data = { @@ -234,7 +235,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn(u'

Settings for test

', output.data) self.assertIn(u'Milestones updated', output.data) # Check the result of the action -- Milestones recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -257,7 +258,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): ' Milestones and dates are not of the ' 'same length', output.data) # Check the result of the action -- Milestones un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -280,7 +281,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): ' Milestone v2.0 is present 2 times', output.data) # Check the result of the action -- Milestones un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -303,7 +304,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): ' Date Next week is present 2 times', output.data) # Check the result of the action -- Milestones un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -366,7 +367,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn(u'

Settings for test

', output.data) self.assertIn(u'Milestones updated', output.data) # Check the result of the action -- Milestones recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {u'v1.0': u'', u'v2.0': u''}) @patch('pagure.lib.git.update_git') @@ -439,7 +440,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): 'Tag added: v%s.0, roadmap' % cnt, output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Mark ticket #1 as Fixed ticket = pagure.lib.search_issues( @@ -498,7 +499,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): output = self.app.get('/foo/roadmap') self.assertEqual(output.status_code, 404) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['issue_tracker'] = False repo.settings = settings diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index f233651..598fd82 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -21,6 +21,7 @@ from mock import patch 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 @@ -141,7 +142,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True 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) @@ -162,7 +163,7 @@ class PagureLibtests(tests.Modeltests): ) # Add an extra user to project `foo` - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.add_user_to_project( session=self.session, project=repo, @@ -225,7 +226,7 @@ class PagureLibtests(tests.Modeltests): self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=2) self.assertEqual(repo.open_tickets, 2) @@ -276,7 +277,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) issue_blocked = pagure.lib.search_issues( self.session, repo, issueid=2) @@ -324,7 +325,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_edit_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) # Add a tag to the issue @@ -362,7 +363,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertRaises( @@ -391,7 +392,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) msgs = pagure.lib.remove_tags_obj( @@ -411,7 +412,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertRaises( @@ -479,7 +480,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_edit_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # All issues issues = pagure.lib.search_issues(self.session, repo) @@ -548,7 +549,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=2) # Before @@ -652,7 +653,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Before issue = pagure.lib.search_issues(self.session, repo, issueid=1) @@ -693,7 +694,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) # Before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 0) # Add an user to a project @@ -716,7 +717,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'User added') # After - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 1) self.assertEqual(repo.users[0].user, 'foo') @@ -784,7 +785,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Project "testproject" created') - repo = pagure.lib.get_project(self.session, 'testproject') + repo = pagure.get_authorized_project(self.session, 'testproject') self.assertEqual(repo.path, 'testproject.git') gitrepo = os.path.join(gitfolder, repo.path) @@ -916,7 +917,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) # Before - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertTrue(repo.settings['issue_tracker']) self.assertFalse(repo.settings['project_documentation']) @@ -954,7 +955,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Edited successfully settings of repo: test2') # After - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertFalse(repo.settings['issue_tracker']) self.assertTrue(repo.settings['project_documentation']) self.assertFalse(repo.settings['pull_requests']) @@ -1020,7 +1021,7 @@ class PagureLibtests(tests.Modeltests): """ Test the get_tags_of_project of pagure.lib. """ self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') tags = pagure.lib.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], ['tag1']) @@ -1029,7 +1030,7 @@ class PagureLibtests(tests.Modeltests): self.session, repo, pattern='T*') self.assertEqual([tag.tag for tag in tags], ['tag1']) - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') tags = pagure.lib.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], []) @@ -1168,7 +1169,7 @@ class PagureLibtests(tests.Modeltests): projects = pagure.lib.search_projects(self.session) self.assertEqual(len(projects), 1) - repo = pagure.lib.get_project(self.session, 'testproject') + repo = pagure.get_authorized_project(self.session, 'testproject') gitrepo = os.path.join(gitfolder, repo.path) docrepo = os.path.join(docfolder, repo.path) ticketrepo = os.path.join(ticketfolder, repo.path) @@ -1274,7 +1275,7 @@ class PagureLibtests(tests.Modeltests): # Fork a fork - repo = pagure.lib.get_project( + repo = pagure.get_authorized_project( self.session, 'testproject', user='foo') msg = pagure.lib.fork_project( @@ -1312,7 +1313,7 @@ class PagureLibtests(tests.Modeltests): self.session.add(item) # Add an extra user to project `foo` - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.open_requests, 0) msg = pagure.lib.add_user_to_project( @@ -1324,8 +1325,8 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User added') - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project( + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project( self.session, 'test', user='pingou') req = pagure.lib.new_pull_request( @@ -1478,7 +1479,7 @@ class PagureLibtests(tests.Modeltests): self.test_new_pull_request() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.open_requests, 1) request = pagure.lib.search_pull_requests(self.session, requestid=1) @@ -1490,7 +1491,7 @@ class PagureLibtests(tests.Modeltests): merged=True, ) self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.open_requests, 0) prs = pagure.lib.search_pull_requests( @@ -1524,7 +1525,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_issue_dependency() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) issue_blocked = pagure.lib.search_issues( self.session, repo, issueid=2) @@ -1584,7 +1585,7 @@ class PagureLibtests(tests.Modeltests): self.test_add_issue_comment() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( @@ -1604,7 +1605,7 @@ class PagureLibtests(tests.Modeltests): self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( @@ -1623,7 +1624,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) # before @@ -1649,7 +1650,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(repo.open_tickets, 2) @@ -1698,7 +1699,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) # Create issues to play with @@ -2219,7 +2220,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) self.test_add_group() - project = pagure.lib.get_project(self.session, 'test2') + project = pagure.get_authorized_project(self.session, 'test2') # Group does not exist self.assertRaises( @@ -2275,7 +2276,7 @@ class PagureLibtests(tests.Modeltests): """ Test the update_watch_status method of pagure.lib. """ tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') # User does not exist self.assertRaises( @@ -2312,7 +2313,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) self.test_add_group() - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') # If user not logged in watch = pagure.lib.is_watching( diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index fff7ac4..e721546 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib.git import tests @@ -52,7 +53,7 @@ class PagureLibGittests(tests.Modeltests): """ Test the write_gitolite_acls function of pagure.lib.git. """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add an user to a project msg = pagure.lib.add_user_to_project( session=self.session, @@ -142,7 +143,7 @@ repo requests/forks/pingou/test3 """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add a couple of groups msg = pagure.lib.add_group( @@ -439,7 +440,7 @@ index 9f44358..2a552bb 100644 os.makedirs(self.gitrepo) repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.get_project(self.session, 'test_ticket_repo') + repo = pagure.get_authorized_project(self.session, 'test_ticket_repo') # Create an issue to play with msg = pagure.lib.new_issue( session=self.session, @@ -637,7 +638,7 @@ index 458821a..77674a8 files = [entry.name for entry in commit.tree] self.assertEqual(files, [hash_file]) - repo = pagure.lib.get_project(self.session, 'test_ticket_repo') + repo = pagure.get_authorized_project(self.session, 'test_ticket_repo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) pagure.lib.git.clean_git(issue, repo, tests.HERE) @@ -666,7 +667,7 @@ index 458821a..77674a8 os.makedirs(self.gitrepo) repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.get_project(self.session, 'test_ticket_repo') + repo = pagure.get_authorized_project(self.session, 'test_ticket_repo') # Create an issue to play with req = pagure.lib.new_pull_request( session=self.session, @@ -827,7 +828,7 @@ index 0000000..60f7480 """ Test the update_ticket_from_git method from pagure.lib.git. """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Before self.assertEqual(len(repo.issues), 0) @@ -950,7 +951,7 @@ index 0000000..60f7480 tests.create_projects(self.session) tests.create_projects_git(os.path.join(tests.HERE, 'repos')) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Before self.assertEqual(len(repo.requests), 0) diff --git a/tests/test_pagure_lib_git_get_tags_objects.py b/tests/test_pagure_lib_git_get_tags_objects.py index 0532273..b596970 100644 --- a/tests/test_pagure_lib_git_get_tags_objects.py +++ b/tests/test_pagure_lib_git_get_tags_objects.py @@ -18,6 +18,7 @@ import pygit2 sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib.git import tests @@ -66,7 +67,7 @@ class PagureLibGitGetTagstests(tests.Modeltests): """ Test the get_git_tags_objects method of pagure.lib.git. """ tests.create_projects(self.session) tests.create_projects_git(os.path.join(tests.HERE, 'repos'), bare=True) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') # Case 1 - Empty repo with no tags exp = [] @@ -91,7 +92,7 @@ class PagureLibGitGetTagstests(tests.Modeltests): self.assertEqual(exp, get_tag_name(tags)) # Case 4 - Sorting with different splitting characters - project = pagure.lib.get_project(self.session, 'test2') + project = pagure.get_authorized_project(self.session, 'test2') tests.add_readme_git_repo(os.path.join(os.path.join( tests.HERE, 'repos'), 'test2.git')) repo = pygit2.Repository(os.path.join(os.path.join( diff --git a/tests/test_pagure_lib_link.py b/tests/test_pagure_lib_link.py index 13082fd..722298a 100644 --- a/tests/test_pagure_lib_link.py +++ b/tests/test_pagure_lib_link.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib.link import tests @@ -61,7 +62,7 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') pagure.lib.new_issue( self.session, repo, @@ -88,7 +89,7 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') pagure.lib.new_issue( self.session, repo, @@ -136,7 +137,7 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') pagure.lib.new_issue( self.session, repo, diff --git a/tests/test_pagure_lib_model.py b/tests/test_pagure_lib_model.py index ff08eb6..3d34e34 100644 --- a/tests/test_pagure_lib_model.py +++ b/tests/test_pagure_lib_model.py @@ -21,6 +21,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -44,7 +45,7 @@ class PagureLibModeltests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Create an issue msg = pagure.lib.new_issue( @@ -82,8 +83,8 @@ class PagureLibModeltests(tests.Modeltests): self.session.commit() self.session.add(item) - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project( + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project( self.session, 'test', user='pingou') # Create an pull-request @@ -125,7 +126,7 @@ class PagureLibModeltests(tests.Modeltests): def test_tagissue__repr__(self): """ Test the TagIssue.__repr__ function of pagure.lib.model. """ self.test_issue__repr__() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issues = pagure.lib.search_issues(self.session, repo) self.assertEqual(len(issues), 1) diff --git a/webhook-server/pagure-webhook-server.py b/webhook-server/pagure-webhook-server.py index 41705f9..28d1278 100644 --- a/webhook-server/pagure-webhook-server.py +++ b/webhook-server/pagure-webhook-server.py @@ -119,7 +119,7 @@ def handle_messages(): else: projectname = data['project'] - project = pagure.lib.get_project( + project = pagure.get_authorized_project( session=pagure.SESSION, name=projectname, user=username) log.info('Got the project, going to the webhooks') call_web_hooks(project, data['topic'], data['msg'])