From 47542138ac8bcc4a883ab680b5c6ce9f034a5f7e Mon Sep 17 00:00:00 2001 From: Lenka Segura Date: Nov 09 2018 10:45:17 +0000 Subject: Fix import issues with retrieval_queries file --- diff --git a/dev-data.py b/dev-data.py index 55be46d..2d3028d 100644 --- a/dev-data.py +++ b/dev-data.py @@ -14,11 +14,12 @@ import shutil import six from sqlalchemy import create_engine, MetaData +from sqlalchemy.orm import * import pagure import tests import pagure.lib.model -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.lib.login import generate_hashed_value from pagure.lib.model import create_default_status from pagure.lib.repo import PagureRepo @@ -45,7 +46,7 @@ def init_database(): acls=_config.get('ACLS', {}), debug=True) - engine = pagure.lib.query.create_engine('%s' % DB_URL, echo=True) + engine = create_engine('%s' % DB_URL, echo=True) metadata = MetaData(engine) metadata.reflect(bind=engine) @@ -291,7 +292,7 @@ def insert_data(session, username, user_email): ###################################### # pagure_user_group - group = pagure.lib.query.search_groups(session, pattern=None, + group = retrieval_queries.search_groups(session, pattern=None, group_name="rel-eng", group_type=None) item = pagure.lib.model.PagureUserGroup( user_id=pingou.id, @@ -300,7 +301,7 @@ def insert_data(session, username, user_email): session.add(item) session.commit() - group = pagure.lib.query.search_groups(session, pattern=None, + group = retrieval_queries.search_groups(session, pattern=None, group_name="admin", group_type=None) item = pagure.lib.model.PagureUserGroup( @@ -310,7 +311,7 @@ def insert_data(session, username, user_email): session.add(item) session.commit() - group = pagure.lib.query.search_groups(session, pattern=None, + group = retrieval_queries.search_groups(session, pattern=None, group_name="group", group_type=None) item = pagure.lib.model.PagureUserGroup( @@ -322,9 +323,9 @@ def insert_data(session, username, user_email): ###################################### # projects_groups - group = pagure.lib.query.search_groups(session, pattern=None, + group = retrieval_queries.search_groups(session, pattern=None, group_name="rel-eng", group_type=None) - repo = pagure.lib.query.get_authorized_project(session, 'test') + repo = retrieval_queries.get_authorized_project(session, 'test') item = pagure.lib.model.ProjectGroup( project_id=repo.id, group_id=group.id, @@ -333,9 +334,9 @@ def insert_data(session, username, user_email): session.add(item) session.commit() - group = pagure.lib.query.search_groups(session, pattern=None, + group = retrieval_queries.search_groups(session, pattern=None, group_name="admin", group_type=None) - repo = pagure.lib.query.get_authorized_project(session, 'test2') + repo = retrieval_queries.get_authorized_project(session, 'test2') item = pagure.lib.model.ProjectGroup( project_id=repo.id, group_id=group.id, @@ -346,9 +347,9 @@ def insert_data(session, username, user_email): ###################################### # pull_requests - repo = pagure.lib.query.get_authorized_project(session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(session, 'test') + forked_repo = retrieval_queries.get_authorized_project(session, 'test') + req = retrieval_queries.new_pull_request( session=session, repo_from=forked_repo, branch_from='master', @@ -365,7 +366,7 @@ def insert_data(session, username, user_email): ###################################### # user_projects - repo = pagure.lib.query.get_authorized_project(session, 'test') + repo = retrieval_queries.get_authorized_project(session, 'test') item = pagure.lib.model.ProjectUser( project_id=repo.id, user_id=foo.id, @@ -374,7 +375,7 @@ def insert_data(session, username, user_email): session.add(item) session.commit() - repo = pagure.lib.query.get_authorized_project(session, 'test2') + repo = retrieval_queries.get_authorized_project(session, 'test2') item = pagure.lib.model.ProjectUser( project_id=repo.id, user_id=you.id, @@ -395,16 +396,16 @@ def insert_data(session, username, user_email): ###################################### # issue_to_issue - repo = pagure.lib.query.get_authorized_project(session, 'test') - all_issues = pagure.lib.query.search_issues(session, repo) - pagure.lib.query.add_issue_dependency(session, all_issues[0], + repo = retrieval_queries.get_authorized_project(session, 'test') + all_issues = retrieval_queries.search_issues(session, repo) + retrieval_queries.add_issue_dependency(session, all_issues[0], all_issues[1], 'pingou') ###################################### # pull_request_comments - user = pagure.lib.query.search_user(session, username='pingou') + user = retrieval_queries.search_user(session, username='pingou') # only 1 pull request available atm - pr = pagure.lib.query.get_pull_request_of_user(session, "pingou")[0] + pr = retrieval_queries.get_pull_request_of_user(session, "pingou")[0] item = pagure.lib.model.PullRequestComment( pull_request_uid=pr.uid, user_id=user.id, @@ -417,7 +418,7 @@ def insert_data(session, username, user_email): ###################################### # pull_request_flags # only 1 pull request available atm - pr = pagure.lib.query.get_pull_request_of_user(session, "pingou")[0] + pr = retrieval_queries.get_pull_request_of_user(session, "pingou")[0] item = pagure.lib.model.PullRequestFlag( uid="random_pr_flag_uid", pull_request_uid=pr.uid, @@ -433,8 +434,8 @@ def insert_data(session, username, user_email): ###################################### # tags_issues - repo = pagure.lib.query.get_authorized_project(session, 'test') - issues = pagure.lib.query.search_issues(session, repo) + repo = retrieval_queries.get_authorized_project(session, 'test') + issues = retrieval_queries.search_issues(session, repo) item = pagure.lib.model.TagIssue( issue_uid=issues[0].uid, tag='tag1', @@ -474,8 +475,8 @@ def insert_data(session, username, user_email): except: print('requests folder already deleted') - repo = pagure.lib.query.get_authorized_project(session, 'test') - result = pagure.lib.query.fork_project(session, 'foo', repo) + repo = retrieval_queries.get_authorized_project(session, 'test') + result = retrieval_queries.fork_project(session, 'foo', repo) if result == 'Repo "test" cloned to "foo/test"': session.commit() diff --git a/files/api_key_expire_mail.py b/files/api_key_expire_mail.py index f246e01..360d069 100755 --- a/files/api_key_expire_mail.py +++ b/files/api_key_expire_mail.py @@ -8,7 +8,7 @@ from datetime import datetime, timedelta from sqlalchemy.exc import SQLAlchemyError import pagure.config -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.notify import pagure.lib.model as model @@ -29,7 +29,7 @@ def main(check=False, debug=False): email_dates = [email_day.date() for email_day in \ [current_time + timedelta(days=i) for i in day_diff_for_mail]] - session = pagure.lib.query.create_session(_config['DB_URL']) + session = retrieval_queries.create_session(_config['DB_URL']) tokens = session.query(model.Token).all() for token in tokens: diff --git a/pagure-ev/pagure_stream_server.py b/pagure-ev/pagure_stream_server.py index a114deb..38656b9 100644 --- a/pagure-ev/pagure_stream_server.py +++ b/pagure-ev/pagure_stream_server.py @@ -40,7 +40,8 @@ if 'PAGURE_CONFIG' not in os.environ \ import pagure # noqa: E402 -import pagure.lib.query # noqa: E402 +from pagure.lib import retrieval_queries # noqa: E402 +import pagure.lib.query from pagure.exceptions import PagureEvException # noqa: E402 SERVER = None @@ -70,7 +71,7 @@ def _get_issue(repo, objid): raise PagureEvException("No issue tracker found for this project") session = _get_session() - issue = pagure.lib.query.search_issues(session, repo, issueid=objid) + issue = retrieval_queries.search_issues(session, repo, issueid=objid) if issue is None or issue.project != repo: raise PagureEvException("Issue '%s' not found" % objid) @@ -92,7 +93,7 @@ def _get_pull_request(repo, objid): "No pull-request tracker found for this project") session = _get_session() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( session, project_id=repo.id, requestid=objid) if request is None or request.project != repo: @@ -165,7 +166,7 @@ def get_obj_from_path(path): """ (username, namespace, reponame, objtype, objid) = _parse_path(path) session = _get_session() - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( session, reponame, user=username, namespace=namespace) if repo is None: diff --git a/pagure-milters/comment_email_milter.py b/pagure-milters/comment_email_milter.py index 3b9da3c..fb76fc1 100644 --- a/pagure-milters/comment_email_milter.py +++ b/pagure-milters/comment_email_milter.py @@ -22,7 +22,7 @@ import requests from Milter.utils import parse_addr import pagure.config -import pagure.lib.query +from pagure.lib import retrieval_queries if 'PAGURE_CONFIG' not in os.environ \ @@ -157,9 +157,9 @@ class PagureMilter(Milter.Base): # they are trying to forge their ID into someone else's salt = _config.get('SALT_EMAIL') from_email = clean_item(msg['From']) - session = pagure.lib.query.create_session(_config['DB_URL']) + session = retrieval_queries.create_session(_config['DB_URL']) try: - user = pagure.lib.query.get_user(session, from_email) + user = retrieval_queries.get_user(session, from_email) except: self.log( "Could not find an user in the DB associated with %s" % diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index b29201a..8705ad5 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -30,7 +30,7 @@ from six.moves.urllib_parse import urljoin API = flask.Blueprint("api_ns", __name__, url_prefix="/api/0") -import pagure.lib.query # noqa: E402 +from pagure.lib import retrieval_queries # noqa: E402 import pagure.lib.tasks # noqa: E402 from pagure.config import config as pagure_config # noqa: E402 from pagure.doc_utils import load_doc, modify_rst, modify_html # noqa: E402 @@ -123,7 +123,7 @@ class APIERROR(enum.Enum): def get_authorized_api_project(session, repo, user=None, namespace=None): """ Helper function to get an authorized_project with optional lock. """ - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, repo, user=user, namespace=namespace ) flask.g.repo = repo @@ -153,7 +153,7 @@ def check_api_acls(acls, optional=False): token_auth = False if token_str: - token = pagure.lib.query.get_api_token(flask.g.session, token_str) + token = retrieval_queries.get_api_token(flask.g.session, token_str) if token and not token.expired: flask.g.authenticated = True if acls and set(token.acls_list).intersection(set(acls)): @@ -389,7 +389,7 @@ def api_users(): if pattern is not None and not pattern.endswith("*"): pattern += "*" - users = pagure.lib.query.search_user(flask.g.session, pattern=pattern) + users = retrieval_queries.search_user(flask.g.session, pattern=pattern) return flask.jsonify( { @@ -399,7 +399,7 @@ def api_users(): { "username": usr.username, "name": usr.fullname, - "image": pagure.lib.query.avatar_url_from_email( + "image": retrieval_queries.avatar_url_from_email( usr.default_email, size=16 ), } @@ -516,7 +516,7 @@ def api_project_tags(repo, username=None): jsonout.status_code = 404 return jsonout - tags = pagure.lib.query.get_tags_of_project( + tags = retrieval_queries.get_tags_of_project( flask.g.session, project_obj, pattern=pattern ) diff --git a/pagure/api/ci/jenkins.py b/pagure/api/ci/jenkins.py index 0dec40e..892fda3 100644 --- a/pagure/api/ci/jenkins.py +++ b/pagure/api/ci/jenkins.py @@ -19,7 +19,7 @@ from kitchen.text.converters import to_bytes import pagure import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.lib_ci as lib_ci from pagure.api import API, APIERROR, api_method @@ -59,7 +59,7 @@ def jenkins_ci_notification( """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( flask.g.session, repo, user=username, namespace=namespace ) flask.g.repo_locked = True diff --git a/pagure/api/fork.py b/pagure/api/fork.py index 480428a..bc1111b 100644 --- a/pagure/api/fork.py +++ b/pagure/api/fork.py @@ -18,7 +18,7 @@ from sqlalchemy.exc import SQLAlchemyError import pagure import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks from pagure.api import ( API, @@ -165,7 +165,7 @@ def api_pull_request_views(repo, username=None, namespace=None): status_text = ("%s" % status).lower() requests = [] if status_text in ["0", "false", "closed"]: - requests = pagure.lib.query.search_pull_requests( + requests = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status=False, @@ -174,7 +174,7 @@ def api_pull_request_views(repo, username=None, namespace=None): ) elif status_text == "all": - requests = pagure.lib.query.search_pull_requests( + requests = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status=None, @@ -183,7 +183,7 @@ def api_pull_request_views(repo, username=None, namespace=None): ) else: - requests = pagure.lib.query.search_pull_requests( + requests = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, assignee=assignee, @@ -194,7 +194,7 @@ def api_pull_request_views(repo, username=None, namespace=None): page = get_page() per_page = get_per_page() - pagination_metadata = pagure.lib.query.get_pagination_metadata( + pagination_metadata = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, len(requests) ) start = (page - 1) * per_page @@ -280,7 +280,7 @@ def api_pull_request_by_uid_view(uid): } """ - request = pagure.lib.query.get_request_by_uid(flask.g.session, uid) + request = retrieval_queries.get_request_by_uid(flask.g.session, uid) if not request: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOREQ) @@ -390,7 +390,7 @@ def api_pull_request_view(repo, requestid, username=None, namespace=None): 404, error_code=APIERROR.EPULLREQUESTSDISABLED ) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -467,7 +467,7 @@ def api_pull_request_merge(repo, requestid, username=None, namespace=None): if flask.g.token.project and repo != flask.g.token.project: raise pagure.exceptions.APIError(401, error_code=APIERROR.EINVALIDTOK) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -562,7 +562,7 @@ def api_pull_request_close(repo, requestid, username=None, namespace=None): if repo != flask.g.token.project: raise pagure.exceptions.APIError(401, error_code=APIERROR.EINVALIDTOK) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -573,7 +573,7 @@ def api_pull_request_close(repo, requestid, username=None, namespace=None): raise pagure.exceptions.APIError(403, error_code=APIERROR.ENOPRCLOSE) try: - pagure.lib.query.close_pull_request( + retrieval_queries.close_pull_request( flask.g.session, request, flask.g.fas_user.username, merged=False ) flask.g.session.commit() @@ -674,7 +674,7 @@ def api_pull_request_add_comment( if flask.g.token.project and repo != flask.g.token.project: raise pagure.exceptions.APIError(401, error_code=APIERROR.EINVALIDTOK) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -690,7 +690,7 @@ def api_pull_request_add_comment( row = form.row.data or None try: # New comment - message = pagure.lib.query.add_pull_request_comment( + message = retrieval_queries.add_pull_request_comment( flask.g.session, request=request, commit=commit, @@ -863,7 +863,7 @@ def api_pull_request_add_flag(repo, requestid, username=None, namespace=None): if flask.g.token.project and repo != flask.g.token.project: raise pagure.exceptions.APIError(401, error_code=APIERROR.EINVALIDTOK) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -893,7 +893,7 @@ def api_pull_request_add_flag(repo, requestid, username=None, namespace=None): ) try: # New Flag - message, uid = pagure.lib.query.add_pull_request_flag( + message, uid = retrieval_queries.add_pull_request_flag( flask.g.session, request=request, username=username, @@ -906,7 +906,7 @@ def api_pull_request_add_flag(repo, requestid, username=None, namespace=None): token=flask.g.token.id, ) flask.g.session.commit() - pr_flag = pagure.lib.query.get_pull_request_flag_by_uid( + pr_flag = retrieval_queries.get_pull_request_flag_by_uid( flask.g.session, request, uid ) output["message"] = message @@ -926,7 +926,7 @@ def api_pull_request_add_flag(repo, requestid, username=None, namespace=None): 400, error_code=APIERROR.EINVALIDREQ, errors=form.errors ) - output["avatar_url"] = pagure.lib.query.avatar_url_from_email( + output["avatar_url"] = retrieval_queries.avatar_url_from_email( flask.g.fas_user.default_email, size=30 ) @@ -1016,7 +1016,7 @@ def api_subscribe_pull_request(repo, requestid, username=None, namespace=None): ) or not authenticated(): raise pagure.exceptions.APIError(401, error_code=APIERROR.EINVALIDTOK) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -1028,7 +1028,7 @@ def api_subscribe_pull_request(repo, requestid, username=None, namespace=None): status = is_true(form.status.data) try: # Toggle subscribtion - message = pagure.lib.query.set_watch_obj( + message = retrieval_queries.set_watch_obj( flask.g.session, user=flask.g.fas_user.username, obj=request, @@ -1036,10 +1036,10 @@ def api_subscribe_pull_request(repo, requestid, username=None, namespace=None): ) flask.g.session.commit() output["message"] = message - user_obj = pagure.lib.query.get_user( + user_obj = retrieval_queries.get_user( flask.g.session, flask.g.fas_user.username ) - output["avatar_url"] = pagure.lib.query.avatar_url_from_email( + output["avatar_url"] = retrieval_queries.avatar_url_from_email( user_obj.default_email, size=30 ) output["user"] = flask.g.fas_user.username @@ -1229,7 +1229,7 @@ def api_pull_request_create(repo, username=None, namespace=None): commit_stop = diff_commits[0].oid.hex commit_start = diff_commits[-1].oid.hex - request = pagure.lib.query.new_pull_request( + request = retrieval_queries.new_pull_request( flask.g.session, repo_to=parent, branch_to=branch_to, @@ -1325,7 +1325,7 @@ def api_pull_request_diffstats(repo, requestid, username=None, namespace=None): 404, error_code=APIERROR.EPULLREQUESTSDISABLED ) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) diff --git a/pagure/api/group.py b/pagure/api/group.py index 596f4ac..ce94769 100644 --- a/pagure/api/group.py +++ b/pagure/api/group.py @@ -15,7 +15,7 @@ import flask import pagure import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.api import ( API, APIERROR, @@ -87,16 +87,16 @@ def api_groups(): page = get_page() per_page = get_per_page() - group_cnt = pagure.lib.query.search_groups( + group_cnt = retrieval_queries.search_groups( flask.g.session, pattern=pattern, count=True ) - pagination_metadata = pagure.lib.query.get_pagination_metadata( + pagination_metadata = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, group_cnt ) query_start = (page - 1) * per_page query_limit = per_page - groups = pagure.lib.query.search_groups( + groups = retrieval_queries.search_groups( flask.g.session, pattern=pattern, limit=query_limit, offset=query_start ) @@ -222,7 +222,7 @@ def api_view_group(group): elif acl: acl = [acl] - group = pagure.lib.query.search_groups(flask.g.session, group_name=group) + group = retrieval_queries.search_groups(flask.g.session, group_name=group) if not group: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOGROUP) diff --git a/pagure/api/issue.py b/pagure/api/issue.py index 4c529b1..039b193 100644 --- a/pagure/api/issue.py +++ b/pagure/api/issue.py @@ -18,7 +18,7 @@ import arrow from sqlalchemy.exc import SQLAlchemyError import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.api import ( API, api_method, @@ -107,7 +107,7 @@ def _get_issue(repo, issueid, issueuid=None): :raises pagure.exceptions.APIError: when issues doesn't exists :return: issue """ - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, repo, issueid=issueid, issueuid=issueuid ) @@ -275,7 +275,7 @@ def api_new_issue(repo, username=None, namespace=None): _check_issue_tracker(repo) _check_token(repo, project_token=False) - user_obj = pagure.lib.query.get_user( + user_obj = retrieval_queries.get_user( flask.g.session, flask.g.fas_user.username ) if not user_obj: @@ -300,7 +300,7 @@ def api_new_issue(repo, username=None, namespace=None): ] try: - issue = pagure.lib.query.new_issue( + issue = retrieval_queries.new_issue( flask.g.session, repo=repo, title=title, @@ -316,7 +316,7 @@ def api_new_issue(repo, username=None, namespace=None): # If there is a file attached, attach it. filestream = flask.request.files.get("filestream") if filestream and "" in issue.content: - new_filename = pagure.lib.query.add_attachment( + new_filename = retrieval_queries.add_attachment( repo=repo, issue=issue, attachmentfolder=pagure_config["ATTACHMENTS_FOLDER"], @@ -590,8 +590,8 @@ def api_view_issues(repo, username=None, namespace=None): page = get_page() per_page = get_per_page() params["count"] = True - issue_cnt = pagure.lib.query.search_issues(**params) - pagination_metadata = pagure.lib.query.get_pagination_metadata( + issue_cnt = retrieval_queries.search_issues(**params) + pagination_metadata = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, issue_cnt ) query_start = (page - 1) * per_page @@ -600,7 +600,7 @@ def api_view_issues(repo, username=None, namespace=None): params["count"] = False params["limit"] = query_limit params["offset"] = query_start - issues = pagure.lib.query.search_issues(**params) + issues = retrieval_queries.search_issues(**params) jsonout = flask.jsonify( { @@ -756,14 +756,14 @@ def api_view_issue_comment( issue = _get_issue(repo, issue_id, issueuid=issue_uid) _check_private_issue_access(issue) - comment = pagure.lib.query.get_issue_comment( + comment = retrieval_queries.get_issue_comment( flask.g.session, issue.uid, commentid ) if not comment: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOCOMMENT) output = comment.to_json(public=True) - output["avatar_url"] = pagure.lib.query.avatar_url_from_email( + output["avatar_url"] = retrieval_queries.avatar_url_from_email( comment.user.default_email, size=16 ) output["comment_date"] = comment.date_created.strftime("%Y-%m-%d %H:%M:%S") @@ -832,7 +832,7 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None): open_access = repo.settings.get("open_metadata_access_to_all", False) _check_ticket_access(issue, assignee=True, open_access=open_access) - status = pagure.lib.query.get_issue_statuses(flask.g.session) + status = retrieval_queries.get_issue_statuses(flask.g.session) form = pagure.forms.StatusForm( status=status, close_status=repo.close_status, csrf_enabled=False ) @@ -849,7 +849,7 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None): if form.validate_on_submit(): try: # Update status - message = pagure.lib.query.edit_issue( + message = retrieval_queries.edit_issue( flask.g.session, issue=issue, status=new_status, @@ -863,7 +863,7 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None): output["message"] = "No changes" if message: - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=issue, messages=message, @@ -955,7 +955,7 @@ def api_change_milestone_issue(repo, issueid, username=None, namespace=None): new_milestone = form.milestone.data or None try: # Update status - message = pagure.lib.query.edit_issue( + message = retrieval_queries.edit_issue( flask.g.session, issue=issue, milestone=new_milestone, @@ -968,7 +968,7 @@ def api_change_milestone_issue(repo, issueid, username=None, namespace=None): output["message"] = "No changes" if message: - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=issue, messages=message, @@ -1051,7 +1051,7 @@ def api_comment_issue(repo, issueid, username=None, namespace=None): comment = form.comment.data try: # New comment - message = pagure.lib.query.add_issue_comment( + message = retrieval_queries.add_issue_comment( flask.g.session, issue=issue, comment=comment, @@ -1069,7 +1069,7 @@ def api_comment_issue(repo, issueid, username=None, namespace=None): 400, error_code=APIERROR.EINVALIDREQ, errors=form.errors ) - output["avatar_url"] = pagure.lib.query.avatar_url_from_email( + output["avatar_url"] = retrieval_queries.avatar_url_from_email( flask.g.fas_user.default_email, size=30 ) @@ -1141,7 +1141,7 @@ def api_assign_issue(repo, issueid, username=None, namespace=None): # Create our metadata comment object try: # New comment - message = pagure.lib.query.add_issue_assignee( + message = retrieval_queries.add_issue_assignee( flask.g.session, issue=issue, assignee=assignee, @@ -1149,7 +1149,7 @@ def api_assign_issue(repo, issueid, username=None, namespace=None): ) flask.g.session.commit() if message: - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=issue, messages=message, @@ -1238,7 +1238,7 @@ def api_subscribe_issue(repo, issueid, username=None, namespace=None): status = is_true(form.status.data) try: # Toggle subscribtion - message = pagure.lib.query.set_watch_obj( + message = retrieval_queries.set_watch_obj( flask.g.session, user=flask.g.fas_user.username, obj=issue, @@ -1246,10 +1246,10 @@ def api_subscribe_issue(repo, issueid, username=None, namespace=None): ) flask.g.session.commit() output["message"] = message - user_obj = pagure.lib.query.get_user( + user_obj = retrieval_queries.get_user( flask.g.session, flask.g.fas_user.username ) - output["avatar_url"] = pagure.lib.query.avatar_url_from_email( + output["avatar_url"] = retrieval_queries.avatar_url_from_email( user_obj.default_email, size=30 ) output["user"] = flask.g.fas_user.username @@ -1334,14 +1334,14 @@ def api_update_custom_field( if value: _check_link_custom_field(key, value) try: - message = pagure.lib.query.set_custom_key_value( + message = retrieval_queries.set_custom_key_value( flask.g.session, issue, key, value ) flask.g.session.commit() if message: output["message"] = message - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=issue, messages=message, @@ -1458,14 +1458,14 @@ def api_update_custom_fields(repo, issueid, username=None, namespace=None): if value: _check_link_custom_field(key, value) try: - message = pagure.lib.query.set_custom_key_value( + message = retrieval_queries.set_custom_key_value( flask.g.session, issue, key, value ) flask.g.session.commit() if message: output["messages"].append({key.name: message}) - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=issue, messages=message, @@ -1529,6 +1529,6 @@ def api_view_issues_history_stats(repo, username=None, namespace=None): repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) - stats = pagure.lib.query.issues_history_stats(flask.g.session, repo) + stats = retrieval_queries.issues_history_stats(flask.g.session, repo) jsonout = flask.jsonify({"stats": stats}) return jsonout diff --git a/pagure/api/project.py b/pagure/api/project.py index ff52249..b01186d 100644 --- a/pagure/api/project.py +++ b/pagure/api/project.py @@ -21,7 +21,7 @@ import pagure import pagure.forms import pagure.exceptions import pagure.lib.git -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.utils from pagure.api import ( API, @@ -158,7 +158,7 @@ def api_project_watchers(repo, username=None, namespace=None): watching_users_to_watch_level = {} for implicit_watch_user in implicit_watch_users: - user_watch_level = pagure.lib.query.get_watch_level_on_repo( + user_watch_level = retrieval_queries.get_watch_level_on_repo( flask.g.session, implicit_watch_user, repo ) watching_users_to_watch_level[implicit_watch_user] = user_watch_level @@ -170,7 +170,7 @@ def api_project_watchers(repo, username=None, namespace=None): for group_name in group_names: if group_name not in watching_users_to_watch_level: watching_users_to_watch_level[group_name] = set() - # By the logic in pagure.lib.query.get_watch_level_on_repo, group + # By the logic in retrieval_queries.get_watch_level_on_repo, group # members only by default watch issues. If they want to watch # commits they have to explicitly subscribe. watching_users_to_watch_level[group_name].add("issues") @@ -185,7 +185,7 @@ def api_project_watchers(repo, username=None, namespace=None): if watcher.watch_issues or watcher.watch_commits: watching_users_to_watch_level[ watcher.user.username - ] = pagure.lib.query.get_watch_level_on_repo( + ] = retrieval_queries.get_watch_level_on_repo( flask.g.session, watcher.user.username, repo ) else: @@ -476,7 +476,7 @@ def api_projects(): if pagure.utils.authenticated() and username == flask.g.fas_user.username: private = flask.g.fas_user.username - project_count = pagure.lib.query.search_projects( + project_count = retrieval_queries.search_projects( flask.g.session, username=username, fork=fork, @@ -491,13 +491,13 @@ def api_projects(): # Pagination code inspired by Flask-SQLAlchemy page = get_page() per_page = get_per_page() - pagination_metadata = pagure.lib.query.get_pagination_metadata( + pagination_metadata = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, project_count ) query_start = (page - 1) * per_page query_limit = per_page - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( flask.g.session, username=username, fork=fork, @@ -741,7 +741,7 @@ def api_new_project(): } """ # noqa - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) output = {} @@ -780,7 +780,7 @@ def api_new_project(): ignore_existing_repos = False try: - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( flask.g.session, name=name, namespace=namespace, @@ -805,7 +805,7 @@ def api_new_project(): if get_request_data().get("wait", True): result = task.get() - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( flask.g.session, name=result["repo"], namespace=result["namespace"], @@ -956,18 +956,18 @@ def api_modify_project(repo, namespace=None): return flask.jsonify(project.to_json(public=False, api=True)) try: - new_main_admin = pagure.lib.query.get_user( + new_main_admin = retrieval_queries.get_user( flask.g.session, args["main_admin"] ) except pagure.exceptions.PagureException: raise pagure.exceptions.APIError(400, error_code=APIERROR.ENOUSER) old_main_admin = project.user.user - pagure.lib.query.set_project_owner( + retrieval_queries.set_project_owner( flask.g.session, project, new_main_admin ) if retain_access and flask.g.fas_user.username == old_main_admin: - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( flask.g.session, project, new_user=flask.g.fas_user.username, @@ -1059,7 +1059,7 @@ def api_fork_project(): ) try: - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( flask.g.session, user=flask.g.fas_user.username, repo=repo ) flask.g.session.commit() @@ -1349,7 +1349,7 @@ def api_commit_flags(repo, commit_hash, username=None, namespace=None): except ValueError: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOCOMMIT) - flags = pagure.lib.query.get_commit_flag( + flags = retrieval_queries.get_commit_flag( flask.g.session, repo, commit_hash ) flags = [f.to_json(public=True) for f in flags] @@ -1500,7 +1500,7 @@ def api_commit_add_flag(repo, commit_hash, username=None, namespace=None): status = form.status.data.strip() try: # New Flag - message, uid = pagure.lib.query.add_commit_flag( + message, uid = retrieval_queries.add_commit_flag( session=flask.g.session, repo=repo, commit_hash=commit_hash, @@ -1514,7 +1514,7 @@ def api_commit_add_flag(repo, commit_hash, username=None, namespace=None): token=flask.g.token.id, ) flask.g.session.commit() - c_flag = pagure.lib.query.get_commit_flag_by_uid( + c_flag = retrieval_queries.get_commit_flag_by_uid( flask.g.session, commit_hash, uid ) output["message"] = message @@ -1640,7 +1640,7 @@ def api_update_project_watchers(repo, username=None, namespace=None): ) try: - pagure.lib.query.get_user(flask.g.session, watcher) + retrieval_queries.get_user(flask.g.session, watcher) except pagure.exceptions.PagureException: _log.debug( "api_update_project_watchers: Invalid user watching: %s", watcher @@ -1650,7 +1650,7 @@ def api_update_project_watchers(repo, username=None, namespace=None): watch_status = data.get("status") try: - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=flask.g.session, project=project, user=watcher, @@ -1811,7 +1811,7 @@ def api_modify_acls(repo, namespace=None, username=None): ) if user: - user_obj = pagure.lib.query.search_user( + user_obj = retrieval_queries.search_user( flask.g.session, username=user ) if not user_obj: @@ -1820,7 +1820,7 @@ def api_modify_acls(repo, namespace=None, username=None): ) elif group: - group_obj = pagure.lib.query.search_groups( + group_obj = retrieval_queries.search_groups( flask.g.session, group_name=group ) if not group_obj: @@ -1837,7 +1837,7 @@ def api_modify_acls(repo, namespace=None, username=None): _log.info( "Adding user %s to project: %s", user, project.fullname ) - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( session=flask.g.session, project=project, new_user=user, @@ -1848,7 +1848,7 @@ def api_modify_acls(repo, namespace=None, username=None): _log.info( "Adding group %s to project: %s", group, project.fullname ) - pagure.lib.query.add_group_to_project( + retrieval_queries.add_group_to_project( session=flask.g.session, project=project, new_group=group, @@ -1865,7 +1865,7 @@ def api_modify_acls(repo, namespace=None, username=None): project.fullname, ) try: - pagure.lib.query.remove_user_of_project( + retrieval_queries.remove_user_of_project( flask.g.session, user_obj, project, diff --git a/pagure/api/user.py b/pagure/api/user.py index f1f6731..6e52a1a 100644 --- a/pagure/api/user.py +++ b/pagure/api/user.py @@ -19,7 +19,7 @@ import six import pagure import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.api import API, api_method, APIERROR, get_page, get_per_page from pagure.utils import is_true @@ -28,7 +28,7 @@ def _get_user(username): """ Check user is valid or not """ try: - return pagure.lib.query.get_user(flask.g.session, username) + return retrieval_queries.get_user(flask.g.session, username) except pagure.exceptions.PagureException: raise pagure.exceptions.APIError(404, error_code=APIERROR.ENOUSER) @@ -135,17 +135,17 @@ def api_view_user(username): except ValueError: forkpage = 1 - repos_cnt = pagure.lib.query.search_projects( + repos_cnt = retrieval_queries.search_projects( flask.g.session, username=username, fork=False, count=True ) - pagination_metadata_repo = pagure.lib.query.get_pagination_metadata( + pagination_metadata_repo = retrieval_queries.get_pagination_metadata( flask.request, repopage, per_page, repos_cnt, key_page="repopage" ) repopage_start = (repopage - 1) * per_page repopage_limit = per_page - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( flask.g.session, username=username, fork=False, @@ -153,17 +153,17 @@ def api_view_user(username): limit=repopage_limit, ) - forks_cnt = pagure.lib.query.search_projects( + forks_cnt = retrieval_queries.search_projects( flask.g.session, username=username, fork=True, count=True ) - pagination_metadata_fork = pagure.lib.query.get_pagination_metadata( + pagination_metadata_fork = retrieval_queries.get_pagination_metadata( flask.request, forkpage, per_page, forks_cnt, key_page="forkpage" ) forkpage_start = (forkpage - 1) * per_page forkpage_limit = per_page - forks = pagure.lib.query.search_projects( + forks = retrieval_queries.search_projects( flask.g.session, username=username, fork=True, @@ -436,10 +436,10 @@ def api_view_user_issues(username): # Issues authored by this user params_created = params.copy() params_created.update({"author": username}) - issues_created = pagure.lib.query.search_issues(**params_created) + issues_created = retrieval_queries.search_issues(**params_created) params_created.update({"offset": None, "limit": None, "count": True}) - issues_created_cnt = pagure.lib.query.search_issues(**params_created) - pagination_issues_created = pagure.lib.query.get_pagination_metadata( + issues_created_cnt = retrieval_queries.search_issues(**params_created) + pagination_issues_created = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, issues_created_cnt ) @@ -451,10 +451,10 @@ def api_view_user_issues(username): # Issues assigned to this user params_assigned = params.copy() params_assigned.update({"assignee": username}) - issues_assigned = pagure.lib.query.search_issues(**params_assigned) + issues_assigned = retrieval_queries.search_issues(**params_assigned) params_assigned.update({"offset": None, "limit": None, "count": True}) - issues_assigned_cnt = pagure.lib.query.search_issues(**params_assigned) - pagination_issues_assigned = pagure.lib.query.get_pagination_metadata( + issues_assigned_cnt = retrieval_queries.search_issues(**params_assigned) + pagination_issues_assigned = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, issues_assigned_cnt ) @@ -572,7 +572,7 @@ def api_view_user_activity_stats(username): user = _get_user(username=username) - stats = pagure.lib.query.get_yearly_stats_user( + stats = retrieval_queries.get_yearly_stats_user( flask.g.session, user, datetime.datetime.utcnow().date() + datetime.timedelta(days=1), @@ -689,7 +689,7 @@ def api_view_user_activity_date(username, date): user = _get_user(username=username) - activities = pagure.lib.query.get_user_activity_day( + activities = retrieval_queries.get_user_activity_day( flask.g.session, user, date, tz=tz ) js_act = [] @@ -704,13 +704,13 @@ def api_view_user_activity_date(username, date): for project in commits: if len(commits[project]) == 1: tmp = dict( - description_mk=pagure.lib.query.text2markdown( + description_mk=retrieval_queries.text2markdown( six.text_type(commits[project][0]) ) ) else: tmp = dict( - description_mk=pagure.lib.query.text2markdown( + description_mk=retrieval_queries.text2markdown( "@%s pushed %s commits to %s" % (username, len(commits[project]), project) ) @@ -720,7 +720,7 @@ def api_view_user_activity_date(username, date): for act in activities: activity = act.to_json(public=True) - activity["description_mk"] = pagure.lib.query.text2markdown( + activity["description_mk"] = retrieval_queries.text2markdown( six.text_type(act) ) js_act.append(activity) @@ -937,14 +937,14 @@ def api_view_user_requests_filed(username): else: status = status.capitalize() - pullrequests_cnt = pagure.lib.query.get_pull_request_of_user( + pullrequests_cnt = retrieval_queries.get_pull_request_of_user( flask.g.session, username=username, status=status, count=True ) - pagination = pagure.lib.query.get_pagination_metadata( + pagination = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, pullrequests_cnt ) - pullrequests = pagure.lib.query.get_pull_request_of_user( + pullrequests = retrieval_queries.get_pull_request_of_user( flask.g.session, username=username, status=status, @@ -1175,14 +1175,14 @@ def api_view_user_requests_actionable(username): else: status = status.capitalize() - pullrequests_cnt = pagure.lib.query.get_pull_request_of_user( + pullrequests_cnt = retrieval_queries.get_pull_request_of_user( flask.g.session, username=username, status=status, count=True ) - pagination = pagure.lib.query.get_pagination_metadata( + pagination = retrieval_queries.get_pagination_metadata( flask.request, page, per_page, pullrequests_cnt ) - pullrequests = pagure.lib.query.get_pull_request_of_user( + pullrequests = retrieval_queries.get_pull_request_of_user( flask.g.session, username=username, status=status, diff --git a/pagure/cli/admin.py b/pagure/cli/admin.py index 215d8fc..a33a089 100644 --- a/pagure/cli/admin.py +++ b/pagure/cli/admin.py @@ -30,13 +30,13 @@ if "PAGURE_CONFIG" not in os.environ and os.path.exists( import pagure.config # noqa: E402 import pagure.exceptions # noqa: E402 import pagure.lib.git # noqa: E402 -import pagure.lib.query # noqa: E402 +from pagure.lib import retrieval_queries # noqa: E402 import pagure.lib.tasks_utils # noqa: E402 from pagure.flask_app import generate_user_key_files # noqa: E402 _config = pagure.config.reload_config() -session = pagure.lib.query.create_session(_config["DB_URL"]) +session = retrieval_queries.create_session(_config["DB_URL"]) _log = logging.getLogger(__name__) @@ -469,7 +469,7 @@ def _get_project(arg_project, user=None): else: name = arg_project - return pagure.lib.query._get_project( + return retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -508,7 +508,7 @@ def do_generate_acl(args): group_obj = None if args.group: - group_obj = pagure.lib.query.search_groups( + group_obj = retrieval_queries.search_groups( session, group_name=args.group ) _log.debug( @@ -559,7 +559,7 @@ def do_generate_hook_token(_): "instance. You should only ever run this for a security issue" ) if _ask_confirmation(): - pagure.lib.query.generate_hook_token(session) + retrieval_queries.generate_hook_token(session) print("Hook token all re-generated") @@ -578,7 +578,7 @@ def do_list_admin_token(args): acls = pagure.config.config["ADMIN_API_ACLS"] if args.all: acls = None - tokens = pagure.lib.query.search_token( + tokens = retrieval_queries.search_token( session, acls, user=args.user, active=args.active, expired=args.expired ) @@ -596,7 +596,7 @@ def do_info_admin_token(args): """ _log.debug("token: %s", args.token) - token = pagure.lib.query.search_token(session, acls=None, token=args.token) + token = retrieval_queries.search_token(session, acls=None, token=args.token) if not token: raise pagure.exceptions.PagureException("No such admin token found") @@ -615,7 +615,7 @@ def do_expire_admin_token(args): _log.debug("token: %s", args.token) acls = pagure.config.config["ADMIN_API_ACLS"] - token = pagure.lib.query.search_token(session, acls, token=args.token) + token = retrieval_queries.search_token(session, acls, token=args.token) if not token: raise pagure.exceptions.PagureException("No such admin token found") @@ -642,7 +642,7 @@ def do_update_admin_token(args): _log.debug("new date: %s", args.date) acls = pagure.config.config["ADMIN_API_ACLS"] - token = pagure.lib.query.search_token(session, acls, token=args.token) + token = retrieval_queries.search_token(session, acls, token=args.token) if not token: raise pagure.exceptions.PagureException("No such admin token found") @@ -685,7 +685,7 @@ def do_create_admin_token(args): """ _log.debug("user: %s", args.user) # Validate user first - pagure.lib.query.get_user(session, args.user) + retrieval_queries.get_user(session, args.user) acls_list = pagure.config.config["ADMIN_API_ACLS"] for idx, acl in enumerate(acls_list): @@ -703,7 +703,7 @@ def do_create_admin_token(args): print("Do you want to create this API token?") if _ask_confirmation(): print( - pagure.lib.query.add_token_to_user(session, None, acls, args.user) + retrieval_queries.add_token_to_user(session, None, acls, args.user) ) @@ -716,7 +716,7 @@ def do_get_watch_status(args): _log.debug("user: %s", args.user) _log.debug("project: %s", args.project) # Validate user - pagure.lib.query.get_user(session, args.user) + retrieval_queries.get_user(session, args.user) # Get the project project = _get_project(args.project) @@ -727,7 +727,7 @@ def do_get_watch_status(args): ) level = ( - pagure.lib.query.get_watch_level_on_repo( + retrieval_queries.get_watch_level_on_repo( session=session, user=args.user, repo=project.name, @@ -759,7 +759,7 @@ def do_update_watch_status(args): _log.debug("project: %s", args.project) # Validate user - pagure.lib.query.get_user(session, args.user) + retrieval_queries.get_user(session, args.user) # Ask the status if none were given if args.status is None: @@ -788,7 +788,7 @@ def do_update_watch_status(args): % (args.user, args.status, WATCH[args.status], args.project) ) - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( session=session, project=project, user=args.user, watch=args.status ) session.commit() @@ -806,7 +806,7 @@ def do_read_only(args): _log.debug("read-only: %s", args.ro) # Validate user - pagure.lib.query.get_user(session, args.user) + retrieval_queries.get_user(session, args.user) # Get the project project = _get_project(args.project, user=args.user) @@ -829,7 +829,7 @@ def do_read_only(args): % (project.fullname, project.read_only) ) else: - pagure.lib.query.update_read_only_mode( + retrieval_queries.update_read_only_mode( session, project, read_only=(args.ro.lower() == "true") ) session.commit() @@ -852,7 +852,7 @@ def do_new_group(args): _log.debug("username: %s", args.username) # Validate user - pagure.lib.query.get_user(session, args.username) + retrieval_queries.get_user(session, args.username) if not args.username: raise pagure.exceptions.PagureException( @@ -869,7 +869,7 @@ def do_new_group(args): if not _ask_confirmation(): return - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( session=session, group_name=args.group_name, display_name=args.display, @@ -891,7 +891,7 @@ def do_list_groups(args): """ - msg = pagure.lib.query.search_groups(session=session) + msg = retrieval_queries.search_groups(session=session) if msg: print("List of groups on this Pagure instance:") for group in msg: @@ -926,7 +926,7 @@ def do_block_user(args): ) # Validate user - user = pagure.lib.query.get_user(session, args.username) + user = retrieval_queries.get_user(session, args.username) print( "The user `%s` will be blocked from all interaction with this " @@ -1021,7 +1021,7 @@ def main(): global session, _config _config = pagure.config.reload_config() - session = pagure.lib.query.create_session(_config["DB_URL"]) + session = retrieval_queries.create_session(_config["DB_URL"]) logging.basicConfig() if args.debug: diff --git a/pagure/doc_utils.py b/pagure/doc_utils.py index a272175..4397f59 100644 --- a/pagure/doc_utils.py +++ b/pagure/doc_utils.py @@ -20,7 +20,7 @@ import markupsafe import textwrap from pagure.config import config as pagure_config -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.encoding_utils @@ -106,7 +106,7 @@ def convert_readme(content, ext, view_file_url=None): safe = True output = convert_doc(output, view_file_url) elif ext and ext in [".mk", ".md", ".markdown"]: - output = pagure.lib.query.text2markdown(output, readme=True) + output = retrieval_queries.text2markdown(output, readme=True) safe = True elif not ext or (ext and ext in [".text", ".txt"]): safe = True diff --git a/pagure/docs_server.py b/pagure/docs_server.py index e2b7636..eabb5dc 100644 --- a/pagure/docs_server.py +++ b/pagure/docs_server.py @@ -21,7 +21,7 @@ from binaryornot.helpers import is_binary_string import pagure.config import pagure.doc_utils import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.mimetype import pagure.forms @@ -31,7 +31,7 @@ APP = flask.Flask(__name__) # set up FAS APP.config = pagure.config.reload_config() -SESSION = pagure.lib.query.create_session(APP.config["DB_URL"]) +SESSION = retrieval_queries.create_session(APP.config["DB_URL"]) if not APP.debug: APP.logger.addHandler( @@ -153,7 +153,7 @@ def view_docs(repo, username=None, namespace=None, filename=None): if "." in repo: namespace, repo = repo.split(".", 1) - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( SESSION, repo, user=username, namespace=namespace ) diff --git a/pagure/flask_app.py b/pagure/flask_app.py index c6d4571..ef3e07e 100644 --- a/pagure/flask_app.py +++ b/pagure/flask_app.py @@ -24,6 +24,7 @@ import pagure.exceptions import pagure.forms import pagure.lib.git import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.login_forms import pagure.mail_logging import pagure.proxy @@ -45,7 +46,7 @@ if ( or pagure_config["WEBHOOK"] or pagure_config.get("PAGURE_CI_SERVICES") ): - pagure.lib.query.set_redis( + retrieval_queries.set_redis( host=pagure_config["REDIS_HOST"], port=pagure_config["REDIS_PORT"], dbname=pagure_config["REDIS_DB"], @@ -173,9 +174,9 @@ def generate_user_key_files(): """ gitolite_home = pagure_config.get("GITOLITE_HOME", None) if gitolite_home: - users = pagure.lib.query.search_user(flask.g.session) + users = retrieval_queries.search_user(flask.g.session) for user in users: - pagure.lib.query.update_user_ssh( + retrieval_queries.update_user_ssh( flask.g.session, user, None, @@ -229,7 +230,7 @@ def set_request(): """ Prepare every request. """ flask.session.permanent = True if not hasattr(flask.g, "session") or not flask.g.session: - flask.g.session = pagure.lib.query.create_session( + flask.g.session = retrieval_queries.create_session( flask.current_app.config["DB_URL"] ) @@ -281,17 +282,17 @@ def set_request(): # If there isn't a `repo` in the URL path, or if there is but the # endpoint called is part of the API, just don't do anything if repo: - flask.g.repo = pagure.lib.query.get_authorized_project( + flask.g.repo = retrieval_queries.get_authorized_project( flask.g.session, repo, user=username, namespace=namespace ) if flask.g.authenticated: - flask.g.repo_forked = pagure.lib.query.get_authorized_project( + flask.g.repo_forked = retrieval_queries.get_authorized_project( flask.g.session, repo, user=flask.g.fas_user.username, namespace=namespace, ) - flask.g.repo_starred = pagure.lib.query.has_starred( + flask.g.repo_starred = retrieval_queries.has_starred( flask.g.session, flask.g.repo, user=flask.g.fas_user.username ) @@ -323,7 +324,7 @@ def set_request(): repouser = flask.g.repo.user.user if flask.g.repo.is_fork else None fas_user = flask.g.fas_user if pagure.utils.authenticated() else None - flask.g.repo_watch_levels = pagure.lib.query.get_watch_level_on_repo( + flask.g.repo_watch_levels = retrieval_queries.get_watch_level_on_repo( flask.g.session, fas_user, flask.g.repo.name, @@ -402,7 +403,7 @@ def auth_login(): # pragma: no cover if not pagure_config.get("ENABLE_GROUP_MNGT", False): groups = [ group.group_name - for group in pagure.lib.query.search_groups( + for group in retrieval_queries.search_groups( flask.g.session, group_type="user" ) ] @@ -450,6 +451,6 @@ def _get_user(username): """ Check if user exists or not """ try: - return pagure.lib.query.get_user(flask.g.session, username) + return retrieval_queries.get_user(flask.g.session, username) except pagure.exceptions.PagureException as e: flask.abort(404, "%s" % e) diff --git a/pagure/forms.py b/pagure/forms.py index 82bb9c7..36d79b3 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -28,7 +28,7 @@ except ImportError: import six import wtforms -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config from pagure.utils import urlpattern, is_admin @@ -122,7 +122,7 @@ def file_virus_validator(form, field): def ssh_key_validator(form, field): """ Form for ssh key validation """ - if not pagure.lib.query.are_valid_ssh_keys(field.data): + if not retrieval_queries.are_valid_ssh_keys(field.data): raise wtforms.ValidationError("Invalid SSH keys") diff --git a/pagure/hooks/__init__.py b/pagure/hooks/__init__.py index 4824074..49703a1 100644 --- a/pagure/hooks/__init__.py +++ b/pagure/hooks/__init__.py @@ -20,7 +20,7 @@ import wtforms from pagure.config import config as pagure_config from pagure.exceptions import FileNotFoundException -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.git from pagure.lib.git_auth import get_git_auth_helper from pagure.lib.plugins import get_enabled_plugins @@ -166,7 +166,7 @@ class BaseHook(object): os.path.dirname(os.path.realpath(__file__)), "files" ) - for repotype in pagure.lib.query.get_repotypes(): + for repotype in retrieval_queries.get_repotypes(): repopath = project.repopath(repotype) if repopath is None: continue @@ -438,7 +438,7 @@ def run_project_hooks( # Determine if this is an actual hook, or if it's a remnant # from a hook that was installed before it was moved to the # runner system. - if os.path.realpath(hookfile) == pagure.lib.query.HOOK_DNE_TARGET: + if os.path.realpath(hookfile) == retrieval_queries.HOOK_DNE_TARGET: continue # Execute @@ -493,7 +493,7 @@ def run_hook_file(hooktype): raise ValueError("Hook type %s not valid" % hooktype) changes = extract_changes(from_stdin=hooktype != "update") - session = pagure.lib.query.create_session(pagure_config["DB_URL"]) + session = retrieval_queries.create_session(pagure_config["DB_URL"]) if not session: raise Exception("Unable to initialize db session") @@ -501,7 +501,7 @@ def run_hook_file(hooktype): is_internal = os.environ.get("internal", False) == "yes" pull_request = None if "pull_request_uid" in os.environ: - pull_request = pagure.lib.query.get_request_by_uid( + pull_request = retrieval_queries.get_request_by_uid( session, os.environ["pull_request_uid"] ) @@ -516,7 +516,7 @@ def run_hook_file(hooktype): repo, ) = pagure.lib.git.get_repo_info_from_path(gitdir) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, repo, user=username, namespace=namespace ) if not project: diff --git a/pagure/hooks/default.py b/pagure/hooks/default.py index 1623126..17b0f5a 100644 --- a/pagure/hooks/default.py +++ b/pagure/hooks/default.py @@ -17,7 +17,7 @@ import six import pagure.config import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks import pagure.lib.tasks_services import pagure.utils @@ -70,7 +70,7 @@ def send_notifications(session, project, repodir, user, refname, revs, forced): for rev in revs: email = pagure.lib.git.get_author_email(rev, repodir) name = pagure.lib.git.get_author(rev, repodir) - author = pagure.lib.query.search_user(session, email=email) or name + author = retrieval_queries.search_user(session, email=email) or name auths.add(author) authors = [] @@ -151,7 +151,7 @@ def inform_pull_request_urls( and target_repo.settings.get("pull_requests", True) ): print() - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session, project_id_from=project.id, status="Open", diff --git a/pagure/hooks/files/repospannerhook b/pagure/hooks/files/repospannerhook index 19e4e9b..6a5a16b 100755 --- a/pagure/hooks/files/repospannerhook +++ b/pagure/hooks/files/repospannerhook @@ -22,7 +22,7 @@ if PYPATH: sys.path.append(PYPATH) import pagure -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.hooks import run_project_hooks, extract_changes from pagure.config import config as pagure_config @@ -40,13 +40,13 @@ pruid = os.environ.get("extra_pull_request_uid", None) changes = extract_changes(from_stdin=hooktype != "update") -session = pagure.lib.query.create_session(pagure_config["DB_URL"]) +session = retrieval_queries.create_session(pagure_config["DB_URL"]) if not session: raise Exception("Unable to initialize db session") gitdir = os.path.abspath(os.environ["GIT_DIR"]) -project = pagure.lib.query._get_project( +project = retrieval_queries._get_project( session, project_name, project_user, project_namespace ) if not project: @@ -55,7 +55,7 @@ if not project: pull_request = None if pruid: - pull_request = pagure.lib.query.get_request_by_uid( + pull_request = retrieval_queries.get_request_by_uid( session, pruid ) diff --git a/pagure/hooks/pagure_hook.py b/pagure/hooks/pagure_hook.py index 7746709..9fc3225 100644 --- a/pagure/hooks/pagure_hook.py +++ b/pagure/hooks/pagure_hook.py @@ -25,7 +25,7 @@ from sqlalchemy.orm import relation from sqlalchemy.orm import backref import pagure.config -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.git from pagure.hooks import BaseHook, BaseRunner from pagure.lib.model import BASE, Project @@ -136,7 +136,7 @@ def relates_commit(session, username, commitid, issue, app_url=None): ) try: - pagure.lib.query.add_issue_comment( + retrieval_queries.add_issue_comment( session, issue=issue, comment=comment, user=username ) session.commit() @@ -168,11 +168,11 @@ def fixes_relation(session, username, commitid, relation, app_url=None): try: if relation.isa == "issue": - pagure.lib.query.add_issue_comment( + retrieval_queries.add_issue_comment( session, issue=relation, comment=comment, user=username ) elif relation.isa == "pull-request": - pagure.lib.query.add_pull_request_comment( + retrieval_queries.add_pull_request_comment( session, request=relation, commit=None, @@ -191,7 +191,7 @@ def fixes_relation(session, username, commitid, relation, app_url=None): try: if relation.isa == "issue": - pagure.lib.query.edit_issue( + retrieval_queries.edit_issue( session, relation, user=username, @@ -199,7 +199,7 @@ def fixes_relation(session, username, commitid, relation, app_url=None): close_status="Fixed", ) elif relation.isa == "pull-request": - pagure.lib.query.close_pull_request( + retrieval_queries.close_pull_request( session, relation, user=username, merged=True ) session.commit() diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index 23c01ff..8e06fb5 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -29,7 +29,7 @@ import pagure # noqa: E402 import pagure.exceptions # noqa: E402 import pagure.forms # noqa: E402 import pagure.lib.git # noqa: E402 -import pagure.lib.query # noqa: E402 +from pagure.lib import retrieval_queries # noqa: E402 import pagure.lib.tasks # noqa: E402 import pagure.utils # noqa: E402 import pagure.ui.fork # noqa: E402 @@ -88,7 +88,7 @@ def lookup_ssh_key(): """ Looks up an SSH key by search_key for keyhelper.py """ search_key = flask.request.form["search_key"] username = flask.request.form.get("username") - key = pagure.lib.query.find_ssh_key(flask.g.session, search_key, username) + key = retrieval_queries.find_ssh_key(flask.g.session, search_key, username) if not key: return flask.jsonify({"found": False}) @@ -127,7 +127,7 @@ def check_ssh_access(): if repo is None: return flask.jsonify({"access": False}) - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( flask.g.session, repo, user=project_user, @@ -169,7 +169,7 @@ def pull_request_add_comment(): objid = pform.objid.data useremail = pform.useremail.data - request = pagure.lib.query.get_request_by_uid( + request = retrieval_queries.get_request_by_uid( flask.g.session, request_uid=objid ) @@ -188,7 +188,7 @@ def pull_request_add_comment(): comment = form.comment.data try: - message = pagure.lib.query.add_pull_request_comment( + message = retrieval_queries.add_pull_request_comment( flask.g.session, request=request, commit=commit, @@ -219,12 +219,12 @@ def ticket_add_comment(): objid = pform.objid.data useremail = pform.useremail.data - issue = pagure.lib.query.get_issue_by_uid(flask.g.session, issue_uid=objid) + issue = retrieval_queries.get_issue_by_uid(flask.g.session, issue_uid=objid) if issue is None: flask.abort(404, "Issue not found") - user_obj = pagure.lib.query.search_user(flask.g.session, email=useremail) + user_obj = retrieval_queries.search_user(flask.g.session, email=useremail) admin = False if user_obj: admin = user_obj.user == issue.project.user.user or ( @@ -249,7 +249,7 @@ def ticket_add_comment(): comment = form.comment.data try: - message = pagure.lib.query.add_issue_comment( + message = retrieval_queries.add_issue_comment( flask.g.session, issue=issue, comment=comment, @@ -283,7 +283,7 @@ def mergeable_request_pull(): requestid = flask.request.form.get("requestid") - request = pagure.lib.query.get_request_by_uid( + request = retrieval_queries.get_request_by_uid( flask.g.session, request_uid=requestid ) @@ -352,7 +352,7 @@ def get_pull_request_ready_branch(): args_namespace = flask.request.form.get("namespace", "").strip() or None args_user = flask.request.form.get("repouser", "").strip() or None - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, args_reponame, namespace=args_namespace, @@ -422,7 +422,7 @@ def get_ticket_template(repo, namespace=None, username=None): response.status_code = 400 return response - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, repo, user=username, namespace=namespace ) @@ -483,7 +483,7 @@ def get_branches_of_commit(): response.status_code = 400 return response - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, flask.request.form.get("repo", "").strip() or None, user=flask.request.form.get("repouser", "").strip() or None, @@ -590,7 +590,7 @@ def get_branches_head(): response.status_code = 400 return response - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, flask.request.form.get("repo", "").strip() or None, namespace=flask.request.form.get("namespace", "").strip() or None, @@ -664,7 +664,7 @@ def get_stats_commits(): response.status_code = 400 return response - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, flask.request.form.get("repo", "").strip() or None, namespace=flask.request.form.get("namespace", "").strip() or None, @@ -708,7 +708,7 @@ def get_stats_commits_trend(): response.status_code = 400 return response - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, flask.request.form.get("repo", "").strip() or None, namespace=flask.request.form.get("namespace", "").strip() or None, @@ -769,7 +769,7 @@ def get_project_family(repo, namespace=None, username=None): response.status_code = 400 return response - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( flask.g.session, repo, user=username, namespace=namespace ) @@ -786,19 +786,19 @@ def get_project_family(repo, namespace=None, username=None): if allows_pr: family = [ p.url_path - for p in pagure.lib.query.get_project_family(flask.g.session, repo) + for p in retrieval_queries.get_project_family(flask.g.session, repo) if p.settings.get("pull_requests", True) ] elif allows_issues: family = [ p.url_path - for p in pagure.lib.query.get_project_family(flask.g.session, repo) + for p in retrieval_queries.get_project_family(flask.g.session, repo) if p.settings.get("issue_tracker", True) ] else: family = [ p.url_path - for p in pagure.lib.query.get_project_family(flask.g.session, repo) + for p in retrieval_queries.get_project_family(flask.g.session, repo) ] return flask.jsonify({"code": "OK", "family": family}) diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 6725076..c2d7645 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -35,7 +35,7 @@ from pygit2.remote import RemoteCollection import pagure.utils import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.notify from pagure.config import config as pagure_config from pagure.lib import model @@ -383,15 +383,15 @@ def get_user_from_json(session, jsondata, key="user"): if not username and not useremails: return - user = pagure.lib.query.search_user(session, username=username) + user = retrieval_queries.search_user(session, username=username) if not user: for email in useremails: - user = pagure.lib.query.search_user(session, email=email) + user = retrieval_queries.search_user(session, email=email) if user: break if not user: - user = pagure.lib.query.set_up_user( + user = retrieval_queries.set_up_user( session=session, username=username, fullname=fullname or username, @@ -417,7 +417,7 @@ def get_project_from_json(session, jsondata): if jsondata.get("parent"): project_user = user.username - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, name, user=project_user, namespace=namespace ) @@ -426,12 +426,12 @@ def get_project_from_json(session, jsondata): if jsondata.get("parent"): parent = get_project_from_json(session, jsondata.get("parent")) - pagure.lib.query.fork_project( + retrieval_queries.fork_project( session=session, repo=parent, user=user.username ) else: - pagure.lib.query.new_project( + retrieval_queries.new_project( session, user=user.username, name=name, @@ -447,13 +447,13 @@ def get_project_from_json(session, jsondata): ) session.commit() - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, name, user=user.username, namespace=namespace ) tags = jsondata.get("tags", None) if tags: - pagure.lib.query.add_tag_obj( + retrieval_queries.add_tag_obj( session, project, tags=tags, user=user.username ) @@ -496,14 +496,14 @@ def update_custom_field_from_json(session, repo, issue, json_data): continue # The key should be present in the database now - key_obj = pagure.lib.query.get_custom_key( + key_obj = retrieval_queries.get_custom_key( session, repo, new_key["name"] ) value = new_key.get("value") if value: value = value.strip() - pagure.lib.query.set_custom_key_value( + retrieval_queries.set_custom_key_value( session, issue=issue, key=key_obj, value=value ) try: @@ -531,7 +531,7 @@ def update_ticket_from_git( """ - repo = pagure.lib.query._get_project( + repo = retrieval_queries._get_project( session, reponame, user=username, namespace=namespace ) @@ -544,13 +544,13 @@ def update_ticket_from_git( user = get_user_from_json(session, json_data) # rely on the agent provided, but if something goes wrong, behave as # ticket creator - agent = pagure.lib.query.search_user(session, username=agent) or user + agent = retrieval_queries.search_user(session, username=agent) or user - issue = pagure.lib.query.get_issue_by_uid(session, issue_uid=issue_uid) + issue = retrieval_queries.get_issue_by_uid(session, issue_uid=issue_uid) messages = [] if not issue: # Create new issue - pagure.lib.query.new_issue( + retrieval_queries.new_issue( session, repo=repo, title=json_data.get("title"), @@ -570,7 +570,7 @@ def update_ticket_from_git( else: # Edit existing issue - msgs = pagure.lib.query.edit_issue( + msgs = retrieval_queries.edit_issue( session, issue=issue, user=agent.username, @@ -586,7 +586,7 @@ def update_ticket_from_git( session.commit() - issue = pagure.lib.query.get_issue_by_uid(session, issue_uid=issue_uid) + issue = retrieval_queries.get_issue_by_uid(session, issue_uid=issue_uid) update_custom_field_from_json( session, repo=repo, issue=issue, json_data=json_data @@ -607,7 +607,7 @@ def update_ticket_from_git( except SQLAlchemyError: session.rollback() try: - msgs = pagure.lib.query.edit_issue( + msgs = retrieval_queries.edit_issue( session, issue=issue, user=agent.username, @@ -637,7 +637,7 @@ def update_ticket_from_git( # Update tags tags = json_data.get("tags", []) - msgs = pagure.lib.query.update_tags( + msgs = retrieval_queries.update_tags( session, issue, tags, username=user.user ) if msgs: @@ -646,7 +646,7 @@ def update_ticket_from_git( # Update assignee assignee = get_user_from_json(session, json_data, key="assignee") if assignee: - msg = pagure.lib.query.add_issue_assignee( + msg = retrieval_queries.add_issue_assignee( session, issue, assignee.username, user=agent.user, notify=False ) if msg: @@ -654,7 +654,7 @@ def update_ticket_from_git( # Update depends depends = json_data.get("depends", []) - msgs = pagure.lib.query.update_dependency_issue( + msgs = retrieval_queries.update_dependency_issue( session, issue.project, issue, depends, username=agent.user ) if msgs: @@ -662,7 +662,7 @@ def update_ticket_from_git( # Update blocks blocks = json_data.get("blocks", []) - msgs = pagure.lib.query.update_blocked_issue( + msgs = retrieval_queries.update_blocked_issue( session, issue.project, issue, blocks, username=agent.user ) if msgs: @@ -670,11 +670,11 @@ def update_ticket_from_git( for comment in json_data["comments"]: usercomment = get_user_from_json(session, comment) - commentobj = pagure.lib.query.get_issue_comment_by_user_and_comment( + commentobj = retrieval_queries.get_issue_comment_by_user_and_comment( session, issue_uid, usercomment.id, comment["comment"] ) if not commentobj: - pagure.lib.query.add_issue_comment( + retrieval_queries.add_issue_comment( session, issue=issue, comment=comment["comment"], @@ -686,7 +686,7 @@ def update_ticket_from_git( ) if messages: - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=session, obj=issue, messages=messages, user=agent.username ) session.commit() @@ -708,7 +708,7 @@ def update_request_from_git( """ - repo = pagure.lib.query._get_project( + repo = retrieval_queries._get_project( session, reponame, user=username, namespace=namespace ) @@ -720,7 +720,7 @@ def update_request_from_git( user = get_user_from_json(session, json_data) - request = pagure.lib.query.get_request_by_uid( + request = retrieval_queries.get_request_by_uid( session, request_uid=request_uid ) @@ -736,7 +736,7 @@ def update_request_from_git( status = "Merged" # Create new request - pagure.lib.query.new_pull_request( + retrieval_queries.new_pull_request( session, repo_from=repo_from, branch_from=json_data.get("branch_from"), @@ -752,7 +752,7 @@ def update_request_from_git( ) session.commit() - request = pagure.lib.query.get_request_by_uid( + request = retrieval_queries.get_request_by_uid( session, request_uid=request_uid ) @@ -763,17 +763,17 @@ def update_request_from_git( # Update assignee assignee = get_user_from_json(session, json_data, key="assignee") if assignee: - pagure.lib.query.add_pull_request_assignee( + retrieval_queries.add_pull_request_assignee( session, request, assignee.username, user=user.user ) for comment in json_data["comments"]: user = get_user_from_json(session, comment) - commentobj = pagure.lib.query.get_request_comment( + commentobj = retrieval_queries.get_request_comment( session, request_uid, comment["id"] ) if not commentobj: - pagure.lib.query.add_pull_request_comment( + retrieval_queries.add_pull_request_comment( session, request, commit=comment["commit"], @@ -883,7 +883,7 @@ class TemporaryClone(object): action (string): Type of action performing, used in the temporary directory name """ - if repotype not in pagure.lib.query.get_repotypes(): + if repotype not in retrieval_queries.get_repotypes(): raise NotImplementedError("Repotype %s not known" % repotype) self._project = project @@ -1525,7 +1525,7 @@ def merge_pull_request(session, request, username, domerge=True): commit = repo_commit.oid.hex else: tree = new_repo.index.write_tree() - user_obj = pagure.lib.query.get_user(session, username) + user_obj = retrieval_queries.get_user(session, username) commitname = user_obj.fullname or user_obj.user author = _make_signature( commitname, user_obj.default_email @@ -1549,7 +1549,7 @@ def merge_pull_request(session, request, username, domerge=True): # Update status _log.info(" Closing the PR in the DB") - pagure.lib.query.close_pull_request(session, request, username) + retrieval_queries.close_pull_request(session, request, username) return "Changes merged!" else: @@ -1595,7 +1595,7 @@ def merge_pull_request(session, request, username, domerge=True): if domerge: _log.info(" PR up to date, closing it") - pagure.lib.query.close_pull_request(session, request, username) + retrieval_queries.close_pull_request(session, request, username) try: session.commit() except SQLAlchemyError: # pragma: no cover @@ -1629,7 +1629,7 @@ def merge_pull_request(session, request, username, domerge=True): commit = repo_commit.oid.hex else: tree = new_repo.index.write_tree() - user_obj = pagure.lib.query.get_user(session, username) + user_obj = retrieval_queries.get_user(session, username) commitname = user_obj.fullname or user_obj.user author = _make_signature( commitname, user_obj.default_email @@ -1698,7 +1698,7 @@ def merge_pull_request(session, request, username, domerge=True): _log.info( " Basing on: %s - %s", head.hex, repo_commit.oid.hex ) - user_obj = pagure.lib.query.get_user(session, username) + user_obj = retrieval_queries.get_user(session, username) commitname = user_obj.fullname or user_obj.user author = _make_signature(commitname, user_obj.default_email) @@ -1737,7 +1737,7 @@ def merge_pull_request(session, request, username, domerge=True): # Update status _log.info(" Closing the PR in the DB") - pagure.lib.query.close_pull_request(session, request, username) + retrieval_queries.close_pull_request(session, request, username) return "Changes merged!" @@ -1975,7 +1975,7 @@ def diff_pull_request( if commenttext: tasks.link_pr_to_ticket.delay(request.uid) if notify: - pagure.lib.query.add_pull_request_comment( + retrieval_queries.add_pull_request_comment( session, request, commit=None, @@ -2106,7 +2106,7 @@ def log_commits_to_db(session, project, commits, gitdir): continue try: - author_obj = pagure.lib.query.get_user( + author_obj = retrieval_queries.get_user( session, commit.author.email ) except pagure.exceptions.PagureException: @@ -2199,7 +2199,7 @@ def delete_project_repos(project): Args: project (Project): Project to delete repos for """ - for repotype in pagure.lib.query.get_repotypes(): + for repotype in retrieval_queries.get_repotypes(): if project.is_on_repospanner: _, regioninfo = project.repospanner_repo_info(repotype) @@ -2264,7 +2264,7 @@ def set_up_project_hooks(project, region, hook=None): # No hooks to set up for this region return - for repotype in pagure.lib.query.get_repotypes(): + for repotype in retrieval_queries.get_repotypes(): data = { "Reponame": project._repospanner_repo_name(repotype, region), "UpdateRequest": { @@ -2383,7 +2383,7 @@ def create_project_repos(project, region, templ, ignore_existing): created_dirs = [] try: - for repotype in pagure.lib.query.get_repotypes(): + for repotype in retrieval_queries.get_repotypes(): created = _create_project_repo( project, region, templ, ignore_existing, repotype ) diff --git a/pagure/lib/git_auth.py b/pagure/lib/git_auth.py index dd7e182..0903228 100644 --- a/pagure/lib/git_auth.py +++ b/pagure/lib/git_auth.py @@ -23,7 +23,7 @@ from six import with_metaclass from six.moves import dbm_gnu import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config from pagure.lib import model @@ -158,7 +158,7 @@ class GitAuthHelper(with_metaclass(abc.ABCMeta, object)): - revto (string): The commit hash the update is happening to. - pull_request (model.PullRequest or None): The PR that is trying to be merged. - - repotype (string): The pagure.lib.query.get_repotypes() value + - repotype (string): The retrieval_queries.get_repotypes() value for the repo being pushed to. - repodir (string): A directory containing the current repository, including the new objects to be approved. @@ -752,7 +752,7 @@ class Gitolite2Auth(GitAuthHelper): _log.info("Refresh gitolite configuration") if project is not None or group is not None: - session = pagure.lib.query.create_session(pagure_config["DB_URL"]) + session = retrieval_queries.create_session(pagure_config["DB_URL"]) cls.write_gitolite_acls( session, project=project, diff --git a/pagure/lib/lib_ci.py b/pagure/lib/lib_ci.py index 76e8fed..6b47ce2 100644 --- a/pagure/lib/lib_ci.py +++ b/pagure/lib/lib_ci.py @@ -16,7 +16,7 @@ from __future__ import unicode_literals import logging import time import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config @@ -91,7 +91,7 @@ def process_jenkins_build(session, project, build_id, iteration=0): "Unknown build status: %s" % result ) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( session, project_id=project.id, requestid=pr_id ) @@ -114,7 +114,7 @@ def process_jenkins_build(session, project, build_id, iteration=0): break _log.info("Flag's UID: %s", uid) - pagure.lib.query.add_pull_request_flag( + retrieval_queries.add_pull_request_flag( session, request=request, username=username, diff --git a/pagure/lib/link.py b/pagure/lib/link.py index e86df26..f09fb58 100644 --- a/pagure/lib/link.py +++ b/pagure/lib/link.py @@ -13,7 +13,7 @@ from __future__ import unicode_literals import re -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.exceptions @@ -73,7 +73,7 @@ def get_relation( """ - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( session, reponame, user=username, namespace=namespace ) if not repo: @@ -95,12 +95,12 @@ def get_relation( relid = motif.match(text).group(1) if relid: - relation = pagure.lib.query.search_issues( + relation = retrieval_queries.search_issues( session, repo=repo, issueid=relid ) if relation is None and include_prs: - relation = pagure.lib.query.search_pull_requests( + relation = retrieval_queries.search_pull_requests( session, project_id=repo.id, requestid=relid ) diff --git a/pagure/lib/model.py b/pagure/lib/model.py index 64a02fc..ba63b89 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -1049,7 +1049,7 @@ class ProjectLocker(object): self.ltype = ltype def __enter__(self): - from pagure.lib.query import create_session + from retrieval_queries import create_session self.session = create_session() diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index 03520c4..7d9a733 100644 --- a/pagure/lib/notify.py +++ b/pagure/lib/notify.py @@ -28,7 +28,7 @@ from email.mime.text import MIMEText from six.moves.urllib_parse import urljoin import flask -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks_services from pagure.config import config as pagure_config @@ -133,7 +133,7 @@ def _add_mentioned_users(emails, comment): """ mentio_re = r"@(\w+)" for username in re.findall(mentio_re, comment): - user = pagure.lib.query.search_user(flask.g.session, username=username) + user = retrieval_queries.search_user(flask.g.session, username=username) if user: emails.add(user.default_email) return emails @@ -326,7 +326,7 @@ def send_email( smtp = None for mailto in to_mail.split(","): try: - pagure.lib.query.allowed_emailaddress(mailto) + retrieval_queries.allowed_emailaddress(mailto) except pagure.exceptions.PagureException: continue msg = MIMEText(text.encode("utf-8"), "plain", "utf-8") diff --git a/pagure/lib/query.py b/pagure/lib/query.py index a35bfc8..593a2a0 100644 --- a/pagure/lib/query.py +++ b/pagure/lib/query.py @@ -62,6 +62,7 @@ import pagure.pfmarkdown import pagure.utils from pagure.config import config as pagure_config from pagure.lib import model +from pagure.lib import retrieval_queries from pagure.lib import tasks from pagure.lib import tasks_services @@ -71,16 +72,6 @@ PAGURE_CI = None _log = logging.getLogger(__name__) # The target for hooks migrated to the Runner system, to be able to detect # whether a hook was migrated without having to open and read the file -HOOK_DNE_TARGET = "/does/not/exist" - - -def get_repotypes(): - rt = ["main", "requests"] - if pagure_config["ENABLE_TICKETS"]: - rt.append("tickets") - if pagure_config["ENABLE_DOCS"]: - rt.append("docs") - return tuple(rt) class Unspecified(object): @@ -91,13 +82,6 @@ class Unspecified(object): pass -def set_redis(host, port, dbname): - """ Set the redis connection with the specified information. """ - global REDIS - pool = redis.ConnectionPool(host=host, port=port, db=dbname) - REDIS = redis.StrictRedis(connection_pool=pool) - - def set_pagure_ci(services): """ Set the list of CI services supported by this pagure instance. """ global PAGURE_CI @@ -107,9 +91,9 @@ def set_pagure_ci(services): def get_user(session, key): """ Searches for a user in the database for a given username or email. """ - user_obj = search_user(session, username=key) + user_obj = retrieval_queries.search_user(session, username=key) if not user_obj: - user_obj = search_user(session, email=key) + user_obj = retrieval_queries.search_user(session, email=key) if not user_obj: raise pagure.exceptions.PagureException('No user "%s" found' % key) @@ -194,49 +178,6 @@ def get_next_id(session, projectid): return nid + 1 -def search_user(session, username=None, email=None, token=None, pattern=None): - """ Searches the database for the user or users matching the given - criterias. - - :arg session: the session to use to connect to the database. - :kwarg username: the username of the user to look for. - :type username: string or None - :kwarg email: the email or one of the email of the user to look for - :type email: string or None - :kwarg token: the token of the user to look for - :type token: string or None - :kwarg pattern: a pattern to search the users with. - :type pattern: string or None - :return: A single User object if any of username, email or token is - specified, a list of User objects otherwise. - :rtype: User or [User] - - """ - query = session.query(model.User).order_by(model.User.user) - - if username is not None: - query = query.filter(model.User.user == username) - - if email is not None: - query = query.filter(model.UserEmail.user_id == model.User.id).filter( - model.UserEmail.email == email - ) - - if token is not None: - query = query.filter(model.User.token == token) - - if pattern: - pattern = pattern.replace("*", "%") - query = query.filter(model.User.user.like(pattern)) - - if any([username, email, token]): - output = query.first() - else: - output = query.all() - - return output - - def is_valid_ssh_key(key, fp_hash="SHA256"): """ Validates the ssh key using ssh-keygen. """ key = key.strip() @@ -1161,7 +1102,7 @@ def add_user_to_project( access_obj = get_obj_access(session, project, new_user_obj) access_obj.access = access project.date_modified = datetime.datetime.utcnow() - update_read_only_mode(session, project, read_only=True) + retrieval_queries.update_read_only_mode(session, project, read_only=True) session.add(access_obj) session.add(project) session.flush() @@ -1186,7 +1127,7 @@ def add_user_to_project( project.date_modified = datetime.datetime.utcnow() session.add(project_user) # Mark the project as read only, celery will then unmark it - update_read_only_mode(session, project, read_only=True) + retrieval_queries.update_read_only_mode(session, project, read_only=True) session.add(project) # Make sure we won't have SQLAlchemy error before we continue session.flush() @@ -1217,11 +1158,11 @@ def add_group_to_project( ): """ Add a specified group to a specified project with some access """ - user_obj = search_user(session, username=user) + user_obj = retrieval_queries.search_user(session, username=user) if not user_obj: raise pagure.exceptions.PagureException("No user %s found." % user) - group_obj = search_groups(session, group_name=new_group) + group_obj = retrieval_queries.search_groups(session, group_name=new_group) if not group_obj: if create: @@ -1265,7 +1206,7 @@ def add_group_to_project( access_obj.access = access session.add(access_obj) project.date_modified = datetime.datetime.utcnow() - update_read_only_mode(session, project, read_only=True) + retrieval_queries.update_read_only_mode(session, project, read_only=True) session.add(project) session.flush() @@ -1290,7 +1231,7 @@ def add_group_to_project( # Make sure we won't have SQLAlchemy error before we continue project.date_modified = datetime.datetime.utcnow() # Mark the project read_only, celery will then unmark it - update_read_only_mode(session, project, read_only=True) + retrieval_queries.update_read_only_mode(session, project, read_only=True) session.add(project) session.flush() @@ -1688,7 +1629,7 @@ def new_project( path = "%s/%s" % (namespace, name) # Repo exists in the DB - repo = _get_project(session, name, namespace=namespace) + repo = retrieval_queries._get_project(session, name, namespace=namespace) # this is leaking private repos but we're leaking them anyway if we fail # to add the requested repo later. Let's be less clear about why :) if repo: @@ -2197,7 +2138,7 @@ def update_project_settings(session, repo, settings, user): ) if "pull_request_access_only" in update: - update_read_only_mode(session, repo, read_only=True) + retrieval_queries.update_read_only_mode(session, repo, read_only=True) session.add(repo) session.flush() pagure.lib.git.generate_gitolite_acls(project=repo) @@ -2233,7 +2174,7 @@ def update_user_settings(session, settings, user): def fork_project(session, user, repo, editbranch=None, editfile=None): """ Fork a given project into the user's forks. """ - if _get_project(session, repo.name, user, repo.namespace) is not None: + if retrieval_queries._get_project(session, repo.name, user, repo.namespace) is not None: raise pagure.exceptions.RepoExistsException( 'Repo "forks/%s/%s" already exists' % (user, repo.name) ) @@ -2710,41 +2651,6 @@ def list_users_projects( return query.all() -def _get_project(session, name, user=None, namespace=None): - """Get a project from the database - """ - case = pagure_config.get("CASE_SENSITIVE", False) - - query = session.query(model.Project) - - if not case: - query = query.filter(func.lower(model.Project.name) == name.lower()) - else: - query = query.filter(model.Project.name == name) - - if namespace: - if not case: - query = query.filter( - func.lower(model.Project.namespace) == namespace.lower() - ) - else: - query = query.filter(model.Project.namespace == namespace) - else: - query = query.filter(model.Project.namespace == namespace) - - if user is not None: - query = ( - query.filter(model.User.user == user) - .filter(model.User.id == model.Project.user_id) - .filter(model.Project.is_fork == True) # noqa: E712 - ) - else: - query = query.filter(model.Project.is_fork == False) # noqa: E712 - - try: - return query.one() - except sqlalchemy.orm.exc.NoResultFound: - return None def search_issues( @@ -3107,114 +3013,6 @@ def get_colored_tag(session, tag, project_id): return query.first() -def search_pull_requests( - session, - requestid=None, - project_id=None, - project_id_from=None, - status=None, - author=None, - assignee=None, - count=False, - offset=None, - limit=None, - updated_after=None, - branch_from=None, - order="desc", - order_key=None, - search_pattern=None, -): - """ Retrieve the specified pull-requests. - """ - - query = session.query(model.PullRequest) - - # by default sort request by date_created. - column = model.PullRequest.date_created - - if order_key == "last_updated": - column = model.PullRequest.last_updated - - if requestid: - query = query.filter(model.PullRequest.id == requestid) - - if updated_after: - query = query.filter(model.PullRequest.last_updated >= updated_after) - - if project_id: - query = query.filter(model.PullRequest.project_id == project_id) - - if project_id_from: - query = query.filter( - model.PullRequest.project_id_from == project_id_from - ) - - if status is not None: - if isinstance(status, bool): - if status: - query = query.filter(model.PullRequest.status == "Open") - else: - query = query.filter(model.PullRequest.status != "Open") - else: - query = query.filter(model.PullRequest.status == status) - - if assignee is not None: - assignee = "%s" % assignee - if not pagure.utils.is_true(assignee, ["false", "0", "true", "1"]): - user2 = aliased(model.User) - if assignee.startswith("!"): - sub = ( - session.query(model.PullRequest.uid) - .filter(model.PullRequest.assignee_id == user2.id) - .filter(user2.user == assignee[1:]) - ) - - query = query.filter(~model.PullRequest.uid.in_(sub)) - else: - query = query.filter( - model.PullRequest.assignee_id == user2.id - ).filter(user2.user == assignee) - elif pagure.utils.is_true(assignee): - query = query.filter(model.PullRequest.assignee_id.isnot(None)) - else: - query = query.filter(model.PullRequest.assignee_id.is_(None)) - - if author is not None: - user3 = aliased(model.User) - query = query.filter(model.PullRequest.user_id == user3.id).filter( - user3.user == author - ) - - if branch_from is not None: - query = query.filter(model.PullRequest.branch_from == branch_from) - - if search_pattern is not None: - if "*" in search_pattern: - search_pattern = search_pattern.replace("*", "%") - else: - search_pattern = "%%%s%%" % search_pattern - query = query.filter(model.PullRequest.title.ilike(search_pattern)) - - # Depending on the order, the query is sorted(default is desc) - if order == "asc": - query = query.order_by(asc(column)) - else: - query = query.order_by(desc(column)) - - if requestid: - output = query.first() - elif count: - output = query.count() - else: - if offset: - query = query.offset(offset) - if limit: - query = query.limit(limit) - output = query.all() - - return output - - def reopen_pull_request(session, request, user): """ Re-Open the provided pull request """ @@ -3300,18 +3098,6 @@ def close_pull_request(session, request, user, merged=True): ) -def reset_status_pull_request(session, project): - """ Reset the status of all opened Pull-Requests of a project. - """ - session.query(model.PullRequest).filter( - model.PullRequest.project_id == project.id - ).filter(model.PullRequest.status == "Open").update( - {model.PullRequest.merge_status: None} - ) - - session.commit() - - def add_attachment(repo, issue, attachmentfolder, user, filename, filestream): """ Add a file to the attachments folder of repo and update git. """ _log.info( @@ -3400,42 +3186,6 @@ def get_request_comment(session, request_uid, comment_id): return query.first() -def get_issue_by_uid(session, issue_uid): - """ Return the issue corresponding to the specified unique identifier. - - :arg session: the session to use to connect to the database. - :arg issue_uid: the unique identifier of an issue. This identifier is - unique accross all projects on this pagure instance and should be - unique accross multiple pagure instances as well - :type issue_uid: str or None - - :return: A single Issue object. - :rtype: pagure.lib.model.Issue - - """ - query = session.query(model.Issue).filter(model.Issue.uid == issue_uid) - return query.first() - - -def get_request_by_uid(session, request_uid): - """ Return the request corresponding to the specified unique identifier. - - :arg session: the session to use to connect to the database. - :arg request_uid: the unique identifier of a request. This identifier is - unique accross all projects on this pagure instance and should be - unique accross multiple pagure instances as well - :type request_uid: str or None - - :return: A single Issue object. - :rtype: pagure.lib.model.PullRequest - - """ - query = session.query(model.PullRequest).filter( - model.PullRequest.uid == request_uid - ) - return query.first() - - def get_pull_request_flag_by_uid(session, request, flag_uid): """ Return the flag corresponding to the specified unique identifier. @@ -3490,7 +3240,7 @@ def set_up_user( keydir=None, ): """ Set up a new user into the database or update its information. """ - user = search_user(session, username=username) + user = retrieval_queries.search_user(session, username=username) if not user: user = model.User( user=username, fullname=fullname, default_email=default_email @@ -3730,7 +3480,7 @@ def add_user_pending_email(session, userobj, email): allowed_emailaddress(email) except pagure.exceptions.PagureException: raise - other_user = search_user(session, email=email) + other_user = retrieval_queries.search_user(session, email=email) if other_user and other_user != userobj: raise pagure.exceptions.PagureException( "Someone else has already registered this email" @@ -3757,7 +3507,7 @@ def resend_pending_email(session, userobj, email): """ Resend to the user the confirmation email for the provided email address. """ - other_user = search_user(session, email=email) + other_user = retrieval_queries.search_user(session, email=email) if other_user and other_user != userobj: raise pagure.exceptions.PagureException( "Someone else has already registered this email address" @@ -3827,54 +3577,6 @@ def get_group_types(session, group_type=None): return query.all() -def search_groups( - session, - pattern=None, - group_name=None, - group_type=None, - display_name=None, - offset=None, - limit=None, - count=False, -): - """ Return the groups based on the criteria specified. - - """ - query = session.query(model.PagureGroup).order_by( - model.PagureGroup.group_type - ) - - if pattern: - pattern = pattern.replace("*", "%") - query = query.filter( - sqlalchemy.or_( - model.PagureGroup.group_name.ilike(pattern), - model.PagureGroup.display_name.ilike(pattern), - ) - ) - - if group_name: - query = query.filter(model.PagureGroup.group_name == group_name) - - if display_name: - query = query.filter(model.PagureGroup.display_name == display_name) - - if group_type: - query = query.filter(model.PagureGroup.group_type == group_type) - - if offset: - query = query.offset(offset) - if limit: - query = query.limit(limit) - - if group_name: - return query.first() - elif count: - return query.count() - else: - return query.all() - - def add_user_to_group( session, username, group, user, is_admin, from_external=False ): @@ -3882,14 +3584,14 @@ def add_user_to_group( from_external indicates whether this is a remotely synced group. """ - new_user = search_user(session, username=username) + new_user = retrieval_queries.search_user(session, username=username) if not new_user: raise pagure.exceptions.PagureException( "No user `%s` found" % username ) action_user = user - user = search_user(session, username=user) + user = retrieval_queries.search_user(session, username=user) if not user: raise pagure.exceptions.PagureException( "No user `%s` found" % action_user @@ -3924,7 +3626,7 @@ def edit_group_info(session, group, display_name, description, user, is_admin): """ Edit the information regarding a given group. """ action_user = user - user = search_user(session, username=user) + user = retrieval_queries.search_user(session, username=user) if not user: raise pagure.exceptions.PagureException( "No user `%s` found" % action_user @@ -3978,21 +3680,21 @@ def delete_user_of_group( ): """ Removes the specified user from the given group. """ - group_obj = search_groups(session, group_name=groupname) + group_obj = retrieval_queries.search_groups(session, group_name=groupname) if not group_obj: raise pagure.exceptions.PagureException( "No group `%s` found" % groupname ) - drop_user = search_user(session, username=username) + drop_user = retrieval_queries.search_user(session, username=username) if not drop_user: raise pagure.exceptions.PagureException( "No user `%s` found" % username ) action_user = user - user = search_user(session, username=user) + user = retrieval_queries.search_user(session, username=user) if not user: raise pagure.exceptions.PagureException( "Could not find user %s" % action_user @@ -4057,19 +3759,19 @@ def add_group( raise pagure.exceptions.PagureException("Invalide type for this group") username = user - user = search_user(session, username=user) + user = retrieval_queries.search_user(session, username=user) if not user: raise pagure.exceptions.PagureException( "Could not find user %s" % username ) - group = search_groups(session, group_name=group_name) + group = retrieval_queries.search_groups(session, group_name=group_name) if group: raise pagure.exceptions.PagureException( "There is already a group named %s" % group_name ) - display = search_groups(session, display_name=display_name) + display = retrieval_queries.search_groups(session, display_name=display_name) if display: raise pagure.exceptions.PagureException( "There is already a group with display name `%s` created." @@ -4112,7 +3814,7 @@ def is_group_member(session, user, groupname): if not user: return False - user = search_user(session, username=user) + user = retrieval_queries.search_user(session, username=user) if not user: return False @@ -4148,7 +3850,7 @@ def add_token_to_user(session, project, acls, username, description=None): """ acls_obj = session.query(model.ACL).filter(model.ACL.name.in_(acls)).all() - user = search_user(session, username=username) + user = retrieval_queries.search_user(session, username=username) token = pagure.lib.model.Token( id=pagure.lib.login.id_generator(64), @@ -4516,9 +4218,9 @@ def get_watch_level_on_repo( if user is None: return [] elif isinstance(user, six.string_types): - user_obj = search_user(session, username=user) + user_obj = retrieval_queries.search_user(session, username=user) else: - user_obj = search_user(session, username=user.username) + user_obj = retrieval_queries.search_user(session, username=user.username) # If we can't find the user in the database, we can't determine their # watch level if not user_obj: @@ -4530,7 +4232,7 @@ def get_watch_level_on_repo( project = repo # If the project passed in a string, then assume it is a project name elif isinstance(repo, six.string_types): - project = _get_project( + project = retrieval_queries._get_project( session, repo, user=repouser, namespace=namespace ) else: @@ -4590,7 +4292,7 @@ def get_watch_level_on_repo( def user_watch_list(session, user, exclude_groups=None): """ Returns list of all the projects which the user is watching """ - user_obj = search_user(session, username=user) + user_obj = retrieval_queries.search_user(session, username=user) if not user_obj: return [] @@ -5400,37 +5102,13 @@ def has_starred(session, repo, user): if not all([repo, user]): return - user_obj = search_user(session, username=user) + user_obj = retrieval_queries.search_user(session, username=user) stargazer_obj = _get_stargazer_obj(session, repo, user_obj) if isinstance(stargazer_obj, model.Star): return True return False -def update_read_only_mode(session, repo, read_only=True): - """ Remove the read only mode from the project - - :arg session: The session object to query the db with - :arg repo: model.Project object to mark/unmark read only - :arg read_only: True if project is to be made read only, - False otherwise - """ - - if ( - not repo - or not isinstance(repo, model.Project) - or read_only not in [True, False] - ): - return - helper = pagure.lib.git_auth.get_git_auth_helper() - if helper.is_dynamic and read_only: - # No need to set a readonly flag if a dynamic auth backend is in use - return - if repo.read_only != read_only: - repo.read_only = read_only - session.add(repo) - - def issues_history_stats(session, project): """ Returns the number of opened issues on the specified project over the last 365 days @@ -5495,7 +5173,7 @@ def get_authorized_project( :rtype: Project """ - repo = _get_project(session, project_name, user, namespace) + repo = retrieval_queries._get_project(session, project_name, user, namespace) if repo and repo.private and not pagure.utils.is_repo_user(repo, asuser): return None @@ -5538,28 +5216,6 @@ def get_project_family(session, project): return [parent] + query.all() -def link_pr_issue(session, issue, request): - """ Associate the specified issue with the specified pull-requets. - - :arg session: The SQLAlchemy session to use - :type session: sqlalchemy.orm.session.Session - :arg issue: The issue mentioned in the commits of the pull-requests to - be associated with - :type issue: pagure.lib.model.Issue - :arg request: A pull-request to associate the specified issue with - :type request: pagure.lib.model.PullRequest - - """ - - associated_issues = [iss.uid for iss in request.related_issues] - if issue.uid not in associated_issues: - obj = model.PrToIssue( - pull_request_uid=request.uid, issue_uid=issue.uid - ) - session.add(obj) - session.flush() - - def remove_user_of_project(session, user, project, agent): """ Remove the specified user from the given project. @@ -5585,7 +5241,7 @@ def remove_user_of_project(session, user, project, agent): break # Mark the project as read_only, celery will unmark it - update_read_only_mode(session, project, read_only=True) + retrieval_queries.update_read_only_mode(session, project, read_only=True) session.commit() pagure.lib.git.generate_gitolite_acls(project=project) diff --git a/pagure/lib/retrieval_queries.py b/pagure/lib/retrieval_queries.py new file mode 100644 index 0000000..5da3da5 --- /dev/null +++ b/pagure/lib/retrieval_queries.py @@ -0,0 +1,359 @@ +import sqlalchemy +import redis + +from pagure.config import config as pagure_config + +HOOK_DNE_TARGET = "/does/not/exist" + +def _get_project(session, name, user=None, namespace=None): + """Get a project from the database + """ + case = pagure_config.get("CASE_SENSITIVE", False) + + query = session.query(model.Project) + + if not case: + query = query.filter(func.lower(model.Project.name) == name.lower()) + else: + query = query.filter(model.Project.name == name) + + if namespace: + if not case: + query = query.filter( + func.lower(model.Project.namespace) == namespace.lower() + ) + else: + query = query.filter(model.Project.namespace == namespace) + else: + query = query.filter(model.Project.namespace == namespace) + + if user is not None: + query = ( + query.filter(model.User.user == user) + .filter(model.User.id == model.Project.user_id) + .filter(model.Project.is_fork == True) # noqa: E712 + ) + else: + query = query.filter(model.Project.is_fork == False) # noqa: E712 + + try: + return query.one() + except sqlalchemy.orm.exc.NoResultFound: + return None + + +def search_user(session, username=None, email=None, token=None, pattern=None): + """ Searches the database for the user or users matching the given + criterias. + + :arg session: the session to use to connect to the database. + :kwarg username: the username of the user to look for. + :type username: string or None + :kwarg email: the email or one of the email of the user to look for + :type email: string or None + :kwarg token: the token of the user to look for + :type token: string or None + :kwarg pattern: a pattern to search the users with. + :type pattern: string or None + :return: A single User object if any of username, email or token is + specified, a list of User objects otherwise. + :rtype: User or [User] + + """ + query = session.query(model.User).order_by(model.User.user) + + if username is not None: + query = query.filter(model.User.user == username) + + if email is not None: + query = query.filter(model.UserEmail.user_id == model.User.id).filter( + model.UserEmail.email == email + ) + + if token is not None: + query = query.filter(model.User.token == token) + + if pattern: + pattern = pattern.replace("*", "%") + query = query.filter(model.User.user.like(pattern)) + + if any([username, email, token]): + output = query.first() + else: + output = query.all() + + return output + + +def get_request_by_uid(session, request_uid): + """ Return the request corresponding to the specified unique identifier. + + :arg session: the session to use to connect to the database. + :arg request_uid: the unique identifier of a request. This identifier is + unique accross all projects on this pagure instance and should be + unique accross multiple pagure instances as well + :type request_uid: str or None + + :return: A single Issue object. + :rtype: pagure.lib.model.PullRequest + + """ + query = session.query(model.PullRequest).filter( + model.PullRequest.uid == request_uid + ) + return query.first() + + +def link_pr_issue(session, issue, request): + """ Associate the specified issue with the specified pull-requets. + + :arg session: The SQLAlchemy session to use + :type session: sqlalchemy.orm.session.Session + :arg issue: The issue mentioned in the commits of the pull-requests to + be associated with + :type issue: pagure.lib.model.Issue + :arg request: A pull-request to associate the specified issue with + :type request: pagure.lib.model.PullRequest + + """ + + associated_issues = [iss.uid for iss in request.related_issues] + if issue.uid not in associated_issues: + obj = model.PrToIssue( + pull_request_uid=request.uid, issue_uid=issue.uid + ) + session.add(obj) + session.flush() + + +def search_pull_requests( + session, + requestid=None, + project_id=None, + project_id_from=None, + status=None, + author=None, + assignee=None, + count=False, + offset=None, + limit=None, + updated_after=None, + branch_from=None, + order="desc", + order_key=None, + search_pattern=None, +): + """ Retrieve the specified pull-requests. + """ + + query = session.query(model.PullRequest) + + # by default sort request by date_created. + column = model.PullRequest.date_created + + if order_key == "last_updated": + column = model.PullRequest.last_updated + + if requestid: + query = query.filter(model.PullRequest.id == requestid) + + if updated_after: + query = query.filter(model.PullRequest.last_updated >= updated_after) + + if project_id: + query = query.filter(model.PullRequest.project_id == project_id) + + if project_id_from: + query = query.filter( + model.PullRequest.project_id_from == project_id_from + ) + + if status is not None: + if isinstance(status, bool): + if status: + query = query.filter(model.PullRequest.status == "Open") + else: + query = query.filter(model.PullRequest.status != "Open") + else: + query = query.filter(model.PullRequest.status == status) + + if assignee is not None: + assignee = "%s" % assignee + if not pagure.utils.is_true(assignee, ["false", "0", "true", "1"]): + user2 = aliased(model.User) + if assignee.startswith("!"): + sub = ( + session.query(model.PullRequest.uid) + .filter(model.PullRequest.assignee_id == user2.id) + .filter(user2.user == assignee[1:]) + ) + + query = query.filter(~model.PullRequest.uid.in_(sub)) + else: + query = query.filter( + model.PullRequest.assignee_id == user2.id + ).filter(user2.user == assignee) + elif pagure.utils.is_true(assignee): + query = query.filter(model.PullRequest.assignee_id.isnot(None)) + else: + query = query.filter(model.PullRequest.assignee_id.is_(None)) + + if author is not None: + user3 = aliased(model.User) + query = query.filter(model.PullRequest.user_id == user3.id).filter( + user3.user == author + ) + + if branch_from is not None: + query = query.filter(model.PullRequest.branch_from == branch_from) + + if search_pattern is not None: + if "*" in search_pattern: + search_pattern = search_pattern.replace("*", "%") + else: + search_pattern = "%%%s%%" % search_pattern + query = query.filter(model.PullRequest.title.ilike(search_pattern)) + + # Depending on the order, the query is sorted(default is desc) + if order == "asc": + query = query.order_by(asc(column)) + else: + query = query.order_by(desc(column)) + + if requestid: + output = query.first() + elif count: + output = query.count() + else: + if offset: + query = query.offset(offset) + if limit: + query = query.limit(limit) + output = query.all() + + return output + + +def search_groups( + session, + pattern=None, + group_name=None, + group_type=None, + display_name=None, + offset=None, + limit=None, + count=False, +): + """ Return the groups based on the criteria specified. + + """ + query = session.query(model.PagureGroup).order_by( + model.PagureGroup.group_type + ) + + if pattern: + pattern = pattern.replace("*", "%") + query = query.filter( + sqlalchemy.or_( + model.PagureGroup.group_name.ilike(pattern), + model.PagureGroup.display_name.ilike(pattern), + ) + ) + + if group_name: + query = query.filter(model.PagureGroup.group_name == group_name) + + if display_name: + query = query.filter(model.PagureGroup.display_name == display_name) + + if group_type: + query = query.filter(model.PagureGroup.group_type == group_type) + + if offset: + query = query.offset(offset) + if limit: + query = query.limit(limit) + + if group_name: + return query.first() + elif count: + return query.count() + else: + return query.all() + + +def update_read_only_mode(session, repo, read_only=True): + """ Remove the read only mode from the project + + :arg session: The session object to query the db with + :arg repo: model.Project object to mark/unmark read only + :arg read_only: True if project is to be made read only, + False otherwise + """ + + if ( + not repo + or not isinstance(repo, model.Project) + or read_only not in [True, False] + ): + return + helper = pagure.lib.git_auth.get_git_auth_helper() + if helper.is_dynamic and read_only: + # No need to set a readonly flag if a dynamic auth backend is in use + return + if repo.read_only != read_only: + repo.read_only = read_only + session.add(repo) + + +def get_issue_by_uid(session, issue_uid): + """ Return the issue corresponding to the specified unique identifier. + + :arg session: the session to use to connect to the database. + :arg issue_uid: the unique identifier of an issue. This identifier is + unique accross all projects on this pagure instance and should be + unique accross multiple pagure instances as well + :type issue_uid: str or None + + :return: A single Issue object. + :rtype: pagure.lib.model.Issue + + """ + query = session.query(model.Issue).filter(model.Issue.uid == issue_uid) + return query.first() + + + +def get_repotypes(): + rt = ["main", "requests"] + if pagure_config["ENABLE_TICKETS"]: + rt.append("tickets") + if pagure_config["ENABLE_DOCS"]: + rt.append("docs") + return tuple(rt) + + + +def reset_status_pull_request(session, project): + """ Reset the status of all opened Pull-Requests of a project. + """ + session.query(model.PullRequest).filter( + model.PullRequest.project_id == project.id + ).filter(model.PullRequest.status == "Open").update( + {model.PullRequest.merge_status: None} + ) + + session.commit() + + +def set_redis(host, port, dbname): + """ Set the redis connection with the specified information. """ + global REDIS + pool = redis.ConnectionPool(host=host, port=port, db=dbname) + REDIS = redis.StrictRedis(connection_pool=pool) + + + + + + diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py index 0977ca4..50fd79a 100644 --- a/pagure/lib/tasks.py +++ b/pagure/lib/tasks.py @@ -32,12 +32,12 @@ from sqlalchemy.exc import SQLAlchemyError import pagure.lib.git import pagure.lib.git_auth import pagure.lib.link -import pagure.lib.query import pagure.lib.repo import pagure.utils from pagure.lib.tasks_utils import pagure_task from pagure.config import config as pagure_config from pagure.utils import get_parent_repo_path +from pagure.lib import retrieval_queries # logging.config.dictConfig(pagure_config.get('LOGGING') or {'version': 1}) _log = get_task_logger(__name__) @@ -98,7 +98,7 @@ def generate_gitolite_acls( """ project = None if name and name != -1: - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -109,7 +109,7 @@ def generate_gitolite_acls( group_obj = None if group: - group_obj = pagure.lib.query.search_groups(session, group_name=group) + group_obj = retrieval_queries.search_groups(session, group_name=group) _log.debug( "Calling helper: %s with arg: project=%s, group=%s", helper, @@ -118,7 +118,7 @@ def generate_gitolite_acls( ) helper.generate_acls(project=project, group=group_obj) - pagure.lib.query.update_read_only_mode(session, project, read_only=False) + retrieval_queries.update_read_only_mode(session, project, read_only=False) try: session.commit() _log.debug("Project %s is no longer in Read Only Mode", project) @@ -167,7 +167,7 @@ def delete_project( :type action_user: None or str """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -232,11 +232,11 @@ def create_project( :type ignore_existing_repo: bool """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name ) - userobj = pagure.lib.query.search_user(session, username=username) + userobj = retrieval_queries.search_user(session, username=username) # Add the readme file if it was asked templ = None @@ -317,7 +317,7 @@ def update_git( """ Update the JSON representation of either a ticket or a pull-request depending on the argument specified. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -329,9 +329,9 @@ def update_git( with project.lock(project_lock): if ticketuid is not None: - obj = pagure.lib.query.get_issue_by_uid(session, ticketuid) + obj = retrieval_queries.get_issue_by_uid(session, ticketuid) elif requestuid is not None: - obj = pagure.lib.query.get_request_by_uid(session, requestuid) + obj = retrieval_queries.get_request_by_uid(session, requestuid) else: raise NotImplementedError("No ticket ID or request ID provided") @@ -349,7 +349,7 @@ def clean_git(self, session, name, namespace, user, obj_repotype, obj_uid): """ Remove the JSON representation of a ticket on the git repository for tickets. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -377,8 +377,8 @@ def update_file_in_git( ): """ Update a file in the specified git repo. """ - userobj = pagure.lib.query.search_user(session, username=username) - project = pagure.lib.query._get_project( + userobj = retrieval_queries.search_user(session, username=username) + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -408,7 +408,7 @@ def update_file_in_git( def delete_branch(self, session, name, namespace, user, branchname): """ Delete a branch from a git repo. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -456,11 +456,11 @@ def fork( :type editfile: str """ - repo_from = pagure.lib.query._get_project( + repo_from = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user_owner ) - repo_to = pagure.lib.query._get_project( + repo_to = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user_forker ) @@ -556,11 +556,11 @@ def refresh_remote_pr(self, session, name, namespace, user, requestid): """ Refresh the local clone of a git repository used in a remote pull-request. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( session, project_id=project.id, requestid=requestid ) _log.debug( @@ -592,7 +592,7 @@ def refresh_remote_pr(self, session, name, namespace, user, requestid): def move_to_repospanner(self, session, name, namespace, user, region): """ Move a repository to a repoSpanner region. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) regioninfo = pagure_config.get("REPOSPANNER_REGIONS", {}).get(region) @@ -605,9 +605,9 @@ def move_to_repospanner(self, session, name, namespace, user, region): raise Exception("Project is already on repoSpanner") # Make sure that no non-runner hooks are enabled for this project - compatible_targets = [pagure.lib.query.HOOK_DNE_TARGET] + compatible_targets = [retrieval_queries.HOOK_DNE_TARGET] incompatible_hooks = [] - for repotype in pagure.lib.query.get_repotypes(): + for repotype in retrieval_queries.get_repotypes(): path = project.repopath(repotype) if path is None: continue @@ -634,7 +634,7 @@ def move_to_repospanner(self, session, name, namespace, user, region): # Create the repositories pagure.lib.git.create_project_repos(project, region, None, False) - for repotype in pagure.lib.query.get_repotypes(): + for repotype in retrieval_queries.get_repotypes(): repopath = project.repopath(repotype) if repopath is None: continue @@ -660,7 +660,7 @@ def move_to_repospanner(self, session, name, namespace, user, region): ) _log.debug("Out: %s" % out) - for repotype in pagure.lib.query.get_repotypes(): + for repotype in retrieval_queries.get_repotypes(): repopath = project.repopath(repotype) if repopath is None: continue @@ -694,11 +694,11 @@ def move_to_repospanner(self, session, name, namespace, user, region): def refresh_pr_cache(self, session, name, namespace, user): """ Refresh the merge status cached of pull-requests. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) - pagure.lib.query.reset_status_pull_request(session, project) + retrieval_queries.reset_status_pull_request(session, project) @conn.task(queue=pagure_config.get("FAST_CELERY_QUEUE", None), bind=True) @@ -715,12 +715,12 @@ def merge_pull_request( ): """ Merge pull-request. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) with project.lock("WORKER"): - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( session, project_id=project.id, requestid=requestid ) _log.debug( @@ -761,13 +761,13 @@ def add_file_to_git( ): """ Add a file to the specified git repo. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) with project.lock("WORKER"): - issue = pagure.lib.query.get_issue_by_uid(session, issueuid) - user_attacher = pagure.lib.query.search_user( + issue = retrieval_queries.get_issue_by_uid(session, issueuid) + user_attacher = retrieval_queries.search_user( session, username=user_attacher ) @@ -793,7 +793,7 @@ def project_dowait(self, session, name, namespace, user): repeatedly. """ assert pagure_config.get("ALLOW_PROJECT_DOWAIT", False) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -811,12 +811,12 @@ def sync_pull_ref(self, session, name, namespace, user, requestid): """ Synchronize a pull/ reference from the content in the forked repo, allowing local checkout of the pull-request. """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) with project.lock("WORKER"): - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( session, project_id=project.id, requestid=requestid ) _log.debug( @@ -843,7 +843,7 @@ def update_pull_request(self, session, pr_uid): """ Updates a pull-request in the DB once a commit was pushed to it in git. """ - request = pagure.lib.query.get_request_by_uid(session, pr_uid) + request = retrieval_queries.get_request_by_uid(session, pr_uid) with request.project.lock("WORKER"): @@ -946,7 +946,7 @@ def commits_author_stats(self, session, repopath): continue # For each recorded user info, check if we know the e-mail address of # the user. - user = pagure.lib.query.search_user(session, email=email) + user = retrieval_queries.search_user(session, email=email) if user and (user.default_email != email or user.fullname != name): # We know the the user, but the name or e-mail used in Git commit # does not match their default e-mail address and full name. Let's @@ -1009,7 +1009,7 @@ def link_pr_to_ticket(self, session, pr_uid): """ _log.info("LINK_PR_TO_TICKET: Linking ticket(s) to PR for: %s" % pr_uid) - request = pagure.lib.query.get_request_by_uid(session, pr_uid) + request = retrieval_queries.get_request_by_uid(session, pr_uid) if not request: _log.info("LINK_PR_TO_TICKET: Not PR found for: %s" % pr_uid) return @@ -1052,7 +1052,7 @@ def link_pr_to_ticket(self, session, pr_uid): "LINK_PR_TO_TICKET: Link ticket %s to PRs %s" % (issue, request) ) - pagure.lib.query.link_pr_issue(session, issue, request) + retrieval_queries.link_pr_issue(session, issue, request) for issue in pagure.lib.link.get_relation( session, name, user, namespace, line, "relates" @@ -1061,7 +1061,7 @@ def link_pr_to_ticket(self, session, pr_uid): "LINK_PR_TO_TICKET: Link ticket %s to PRs %s" % (issue, request) ) - pagure.lib.query.link_pr_issue(session, issue, request) + retrieval_queries.link_pr_issue(session, issue, request) try: session.commit() @@ -1073,7 +1073,7 @@ def link_pr_to_ticket(self, session, pr_uid): @conn.task(queue=pagure_config.get("MEDIUM_CELERY_QUEUE", None), bind=True) @pagure_task def pull_request_ready_branch(self, session, namespace, name, user): - repo = pagure.lib.query._get_project( + repo = retrieval_queries._get_project( session, name, user=user, namespace=namespace ) repo_obj = pygit2.Repository(pagure.utils.get_repo_path(repo)) @@ -1139,7 +1139,7 @@ def pull_request_ready_branch(self, session, namespace, name, user): "target_branch": compare_branch or "master", } - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session, project_id_from=repo.id, status="Open" ) branches_pr = {} diff --git a/pagure/lib/tasks_mirror.py b/pagure/lib/tasks_mirror.py index fea834e..d1eacac 100644 --- a/pagure/lib/tasks_mirror.py +++ b/pagure/lib/tasks_mirror.py @@ -25,7 +25,7 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.asymmetric import rsa from cryptography.hazmat.primitives import serialization -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config from pagure.lib.tasks_utils import pagure_task from pagure.utils import ssh_urlpattern @@ -113,7 +113,7 @@ def setup_mirroring(self, session, username, namespace, name): plugin = pagure.lib.plugins.get_plugin("Mirroring") plugin.db_object() - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=username ) @@ -167,7 +167,7 @@ def teardown_mirroring(self, session, username, namespace, name): plugin = pagure.lib.plugins.get_plugin("Mirroring") plugin.db_object() - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=username ) @@ -196,7 +196,7 @@ def mirror_project(self, session, username, namespace, name): plugin = pagure.lib.plugins.get_plugin("Mirroring") plugin.db_object() - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=username ) diff --git a/pagure/lib/tasks_services.py b/pagure/lib/tasks_services.py index 1a8c0f3..9257686 100644 --- a/pagure/lib/tasks_services.py +++ b/pagure/lib/tasks_services.py @@ -28,7 +28,7 @@ from celery.utils.log import get_task_logger from kitchen.text.converters import to_bytes from sqlalchemy.exc import SQLAlchemyError -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config from pagure.lib.tasks_utils import pagure_task from pagure.mail_logging import format_callstack @@ -133,7 +133,7 @@ def webhook_notification( :type user: None or str """ - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, namespace=namespace, name=name, user=user ) @@ -189,7 +189,7 @@ def log_commit_send_notifications( name, username, ) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, name, user=username, namespace=namespace ) @@ -288,7 +288,7 @@ def load_json_commits_to_db( username, ) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( session, name, user=username, namespace=namespace ) @@ -376,7 +376,7 @@ def load_json_commits_to_db( "No agent found: %s" % agent ) if agent != "pagure": - user_obj = pagure.lib.query.get_user(session, agent) + user_obj = retrieval_queries.get_user(session, agent) pagure.lib.notify.send_email( "\n".join(mail_body), "Issue import report", @@ -406,7 +406,7 @@ def trigger_ci_build( return if pr_uid: - pr = pagure.lib.query.get_request_by_uid(session, pr_uid) + pr = retrieval_queries.get_request_by_uid(session, pr_uid) if pr.remote: project_name = pr.project_to.fullname else: @@ -415,7 +415,7 @@ def trigger_ci_build( user, namespace, project_name = split_project_fullname(project_name) _log.info("Pagure-CI: Looking for project: %s", project_name) - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( session=session, project_name=project_name, user=user, diff --git a/pagure/lib/tasks_utils.py b/pagure/lib/tasks_utils.py index c71ec52..294bdd4 100644 --- a/pagure/lib/tasks_utils.py +++ b/pagure/lib/tasks_utils.py @@ -13,7 +13,7 @@ from __future__ import unicode_literals import gc from functools import wraps -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config @@ -31,7 +31,7 @@ def pagure_task(function): self.update_state(state="RUNNING") except TypeError: pass - session = pagure.lib.query.create_session(pagure_config["DB_URL"]) + session = retrieval_queries.create_session(pagure_config["DB_URL"]) try: return function(self, session, *args, **kwargs) except: # noqa: E722 diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py index 39820ab..25a8224 100644 --- a/pagure/pfmarkdown.py +++ b/pagure/pfmarkdown.py @@ -30,7 +30,7 @@ import pygit2 import re import six -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config @@ -81,7 +81,7 @@ class MentionPattern(markdown.inlinepatterns.Pattern): """ When the pattern matches, update the text. """ name = markdown.util.AtomicString(m.group(2)) text = "@%s" % name - user = pagure.lib.query.search_user(flask.g.session, username=name) + user = retrieval_queries.search_user(flask.g.session, username=name) if not user: return text @@ -157,7 +157,7 @@ class CommitLinkPattern(markdown.inlinepatterns.Pattern): user = user.rstrip("/") text = "%s/%s" % (user.rstrip("/"), text) - if pagure.lib.query.search_projects( + if retrieval_queries.search_projects( flask.g.session, username=user, fork=is_fork, @@ -285,7 +285,7 @@ class ImplicitCommitPattern(markdown.inlinepatterns.Pattern): except RuntimeError: return text - if pagure.lib.query.search_projects( + if retrieval_queries.search_projects( flask.g.session, username=user, namespace=namespace, pattern=repo ) and _commit_exists(user, namespace, repo, githash): return _obj_anchor_tag(user, namespace, repo, githash, text[:7]) @@ -402,14 +402,14 @@ def makeExtension(*arg, **kwargs): def _issue_exists(user, namespace, repo, idx): """ Utility method checking if a given issue exists. """ - repo_obj = pagure.lib.query.get_authorized_project( + repo_obj = retrieval_queries.get_authorized_project( flask.g.session, project_name=repo, user=user, namespace=namespace ) if not repo_obj: return False - issue_obj = pagure.lib.query.search_issues( + issue_obj = retrieval_queries.search_issues( flask.g.session, repo=repo_obj, issueid=idx ) if not issue_obj: @@ -420,14 +420,14 @@ def _issue_exists(user, namespace, repo, idx): def _pr_exists(user, namespace, repo, idx): """ Utility method checking if a given PR exists. """ - repo_obj = pagure.lib.query.get_authorized_project( + repo_obj = retrieval_queries.get_authorized_project( flask.g.session, project_name=repo, user=user, namespace=namespace ) if not repo_obj: return False - pr_obj = pagure.lib.query.search_pull_requests( + pr_obj = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo_obj.id, requestid=idx ) if not pr_obj: @@ -438,7 +438,7 @@ def _pr_exists(user, namespace, repo, idx): def _commit_exists(user, namespace, repo, githash): """ Utility method checking if a given commit exists. """ - repo_obj = pagure.lib.query.get_authorized_project( + repo_obj = retrieval_queries.get_authorized_project( flask.g.session, project_name=repo, user=user, namespace=namespace ) if not repo_obj: diff --git a/pagure/ui/app.py b/pagure/ui/app.py index e29f3f7..f30e40a 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -21,6 +21,7 @@ from sqlalchemy.exc import SQLAlchemyError import pagure.exceptions import pagure.lib.git import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.forms import pagure.ui.filters from pagure.config import config as pagure_config @@ -82,7 +83,7 @@ def index(): if authenticated(): private = flask.g.fas_user.username - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( flask.g.session, fork=False, start=start, @@ -91,7 +92,7 @@ def index(): private=private, ) - num_repos = pagure.lib.query.search_projects( + num_repos = retrieval_queries.search_projects( flask.g.session, fork=False, private=private, count=True ) total_page = int(ceil(num_repos / float(limit)) if num_repos > 0 else 1) @@ -111,7 +112,7 @@ def index(): def get_userdash_common(user): userdash_counts = {} - userdash_counts["repos_length"] = pagure.lib.query.list_users_projects( + userdash_counts["repos_length"] = retrieval_queries.list_users_projects( flask.g.session, username=flask.g.fas_user.username, exclude_groups=None, @@ -120,7 +121,7 @@ def get_userdash_common(user): count=True, ) - userdash_counts["forks_length"] = pagure.lib.query.search_projects( + userdash_counts["forks_length"] = retrieval_queries.search_projects( flask.g.session, username=flask.g.fas_user.username, fork=True, @@ -129,7 +130,7 @@ def get_userdash_common(user): ) userdash_counts["watchlist_length"] = len( - pagure.lib.query.user_watch_list( + retrieval_queries.user_watch_list( flask.g.session, user=flask.g.fas_user.username, exclude_groups=pagure_config.get("EXCLUDE_GROUP_INDEX"), @@ -138,7 +139,7 @@ def get_userdash_common(user): userdash_counts["groups_length"] = len(user.groups) - search_data = pagure.lib.query.list_users_projects( + search_data = retrieval_queries.list_users_projects( flask.g.session, username=flask.g.fas_user.username, private=flask.g.fas_user.username, @@ -160,7 +161,7 @@ def userdash_projects(): for group in user.groups: groups.append( - pagure.lib.query.search_groups( + retrieval_queries.search_groups( flask.g.session, group_name=group, group_type="user" ) ) @@ -183,7 +184,7 @@ def userdash_projects(): pattern = "*" + search_pattern + "*" if search_pattern else search_pattern start = limit * (repopage - 1) - repos = pagure.lib.query.list_users_projects( + repos = retrieval_queries.list_users_projects( flask.g.session, username=flask.g.fas_user.username, exclude_groups=None, @@ -195,7 +196,7 @@ def userdash_projects(): acls=[acl] if acl else None, ) - filtered_repos_count = pagure.lib.query.list_users_projects( + filtered_repos_count = retrieval_queries.list_users_projects( flask.g.session, username=flask.g.fas_user.username, exclude_groups=None, @@ -261,7 +262,7 @@ def userdash_activity(): user = _get_user(username=flask.g.fas_user.username) userdash_counts, search_data = get_userdash_common(user) - messages = pagure.lib.query.get_watchlist_messages( + messages = retrieval_queries.get_watchlist_messages( flask.g.session, user, limit=20 ) @@ -289,7 +290,7 @@ def userdash_groups(): for group in user.groups: groups.append( - pagure.lib.query.search_groups( + retrieval_queries.search_groups( flask.g.session, group_name=group, group_type="user" ) ) @@ -326,7 +327,7 @@ def userdash_forks(): forkpage = 1 start = limit * (forkpage - 1) - forks = pagure.lib.query.search_projects( + forks = retrieval_queries.search_projects( flask.g.session, username=flask.g.fas_user.username, fork=True, @@ -361,7 +362,7 @@ def userdash_watchlist(): """ User Dashboard page for a user's watchlist """ - watch_list = pagure.lib.query.user_watch_list( + watch_list = retrieval_queries.user_watch_list( flask.g.session, user=flask.g.fas_user.username, exclude_groups=pagure_config.get("EXCLUDE_GROUP_INDEX"), @@ -400,7 +401,7 @@ def index_auth(): # PROJECTS start = limit * (repopage - 1) - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( flask.g.session, username=flask.g.fas_user.username, exclude_groups=pagure_config.get("EXCLUDE_GROUP_INDEX"), @@ -412,7 +413,7 @@ def index_auth(): if repos and acl: repos = _filter_acls(repos, acl, user) - repos_length = pagure.lib.query.search_projects( + repos_length = retrieval_queries.search_projects( flask.g.session, username=flask.g.fas_user.username, exclude_groups=pagure_config.get("EXCLUDE_GROUP_INDEX"), @@ -434,7 +435,7 @@ def index_auth(): forkpage = 1 start = limit * (forkpage - 1) - forks = pagure.lib.query.search_projects( + forks = retrieval_queries.search_projects( flask.g.session, username=flask.g.fas_user.username, fork=True, @@ -443,7 +444,7 @@ def index_auth(): limit=limit, ) - forks_length = pagure.lib.query.search_projects( + forks_length = retrieval_queries.search_projects( flask.g.session, username=flask.g.fas_user.username, fork=True, @@ -456,7 +457,7 @@ def index_auth(): ceil(forks_length / float(limit)) if forks_length > 0 else 1 ) - watch_list = pagure.lib.query.user_watch_list( + watch_list = retrieval_queries.user_watch_list( flask.g.session, user=flask.g.fas_user.username, exclude_groups=pagure_config.get("EXCLUDE_GROUP_INDEX"), @@ -526,7 +527,7 @@ def view_users(username=None): except ValueError: page = 1 - users = pagure.lib.query.search_user(flask.g.session, pattern=username) + users = retrieval_queries.search_user(flask.g.session, pattern=username) private = False # Condition to check non-authorized user should't be able to access private @@ -543,7 +544,7 @@ def view_users(username=None): total_page = int(ceil(users_length / float(limit))) for user in users: - repos_length = pagure.lib.query.search_projects( + repos_length = retrieval_queries.search_projects( flask.g.session, username=user.user, fork=False, @@ -551,7 +552,7 @@ def view_users(username=None): private=private, ) - forks_length = pagure.lib.query.search_projects( + forks_length = retrieval_queries.search_projects( flask.g.session, username=user.user, fork=True, @@ -603,7 +604,7 @@ def view_projects(pattern=None, namespace=None): limit = pagure_config["ITEM_PER_PAGE"] start = limit * (page - 1) - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( flask.g.session, pattern=pattern, namespace=namespace, @@ -626,7 +627,7 @@ def view_projects(pattern=None, namespace=None): ) ) - projects_length = pagure.lib.query.search_projects( + projects_length = retrieval_queries.search_projects( flask.g.session, pattern=pattern, namespace=namespace, @@ -654,7 +655,7 @@ def view_projects(pattern=None, namespace=None): def get_userprofile_common(user): userprofile_counts = {} - userprofile_counts["repos_length"] = pagure.lib.query.search_projects( + userprofile_counts["repos_length"] = retrieval_queries.search_projects( flask.g.session, username=user.username, fork=False, @@ -663,7 +664,7 @@ def get_userprofile_common(user): count=True, ) - userprofile_counts["forks_length"] = pagure.lib.query.search_projects( + userprofile_counts["forks_length"] = retrieval_queries.search_projects( flask.g.session, username=user.username, fork=True, @@ -685,7 +686,7 @@ def view_user(username): # even if the user is viewing themself private = False - owned_repos = pagure.lib.query.list_users_projects( + owned_repos = retrieval_queries.list_users_projects( flask.g.session, username=username, exclude_groups=None, @@ -726,7 +727,7 @@ def userprofile_projects(username): limit = pagure_config["ITEM_PER_PAGE"] repo_start = limit * (repopage - 1) - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( flask.g.session, username=username, fork=False, @@ -772,7 +773,7 @@ def userprofile_forks(username): limit = pagure_config["ITEM_PER_PAGE"] fork_start = limit * (forkpage - 1) - forks = pagure.lib.query.search_projects( + forks = retrieval_queries.search_projects( flask.g.session, username=username, fork=True, @@ -833,7 +834,7 @@ def view_user2(username): if authenticated() and username == flask.g.fas_user.username: private = flask.g.fas_user.username - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( flask.g.session, username=username, fork=False, @@ -846,7 +847,7 @@ def view_user2(username): if repos and acl: repos = _filter_acls(repos, acl, user) - repos_length = pagure.lib.query.search_projects( + repos_length = retrieval_queries.search_projects( flask.g.session, username=username, fork=False, @@ -855,7 +856,7 @@ def view_user2(username): count=True, ) - forks = pagure.lib.query.search_projects( + forks = retrieval_queries.search_projects( flask.g.session, username=username, fork=True, @@ -864,7 +865,7 @@ def view_user2(username): private=private, ) - forks_length = pagure.lib.query.search_projects( + forks_length = retrieval_queries.search_projects( flask.g.session, username=username, fork=True, @@ -897,7 +898,7 @@ def view_user_requests(username): """ user = _get_user(username=username) - requests = pagure.lib.query.get_pull_request_of_user( + requests = retrieval_queries.get_pull_request_of_user( flask.g.session, username=username ) @@ -976,7 +977,7 @@ def userprofile_groups(username): groups = [] for groupname in user.groups: groups.append( - pagure.lib.query.search_groups( + retrieval_queries.search_groups( flask.g.session, group_name=groupname ) ) @@ -999,7 +1000,7 @@ def new_project(): """ Form to create a new project. """ - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) @@ -1042,7 +1043,7 @@ def new_project(): ignore_existing_repos = False try: - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( flask.g.session, name=name, private=private, @@ -1145,7 +1146,7 @@ def update_user_settings(): settings[key] = flask.request.form[key] try: - message = pagure.lib.query.update_user_settings( + message = retrieval_queries.update_user_settings( flask.g.session, settings=settings, user=user.username ) flask.g.session.commit() @@ -1177,7 +1178,7 @@ def add_user_sshkey(): if form.validate_on_submit(): user = _get_user(username=flask.g.fas_user.username) try: - msg = pagure.lib.query.add_sshkey_to_project_or_user( + msg = retrieval_queries.add_sshkey_to_project_or_user( flask.g.session, ssh_key=form.ssh_key.data, pushaccess=True, @@ -1185,7 +1186,7 @@ def add_user_sshkey(): user=user, ) flask.g.session.commit() - pagure.lib.query.create_user_ssh_keys_on_disk( + retrieval_queries.create_user_ssh_keys_on_disk( user, pagure_config.get("GITOLITE_KEYDIR", None) ) pagure.lib.tasks.gitolite_post_compile_only.delay() @@ -1236,7 +1237,7 @@ def remove_user_sshkey(keyid): try: flask.g.session.commit() - pagure.lib.query.create_user_ssh_keys_on_disk( + retrieval_queries.create_user_ssh_keys_on_disk( user, pagure_config.get("GITOLITE_KEYDIR", None) ) pagure.lib.tasks.gitolite_post_compile_only.delay() @@ -1328,7 +1329,7 @@ def add_user_email(): email = form.email.data try: - pagure.lib.query.add_user_pending_email( + retrieval_queries.add_user_pending_email( flask.g.session, user, email ) flask.g.session.commit() @@ -1399,7 +1400,7 @@ def reconfirm_email(): email = form.email.data try: - pagure.lib.query.resend_pending_email(flask.g.session, user, email) + retrieval_queries.resend_pending_email(flask.g.session, user, email) flask.g.session.commit() flask.flash("Confirmation email re-sent") except pagure.exceptions.PagureException as err: @@ -1422,12 +1423,12 @@ def confirm_email(token): flask.url_for("auth_login", next=flask.request.url) ) - email = pagure.lib.query.search_pending_email(flask.g.session, token=token) + email = retrieval_queries.search_pending_email(flask.g.session, token=token) if not email: flask.flash("No email associated with this token.", "error") else: try: - pagure.lib.query.add_email_to_user( + retrieval_queries.add_email_to_user( flask.g.session, email.user, email.email ) flask.g.session.delete(email) @@ -1473,14 +1474,14 @@ def add_api_user_token(): # Ensure the user is in the DB at least user = _get_user(username=flask.g.fas_user.username) - acls = pagure.lib.query.get_acls( + acls = retrieval_queries.get_acls( flask.g.session, restrict=pagure_config.get("CROSS_PROJECT_ACLS") ) form = pagure.forms.NewTokenForm(acls=acls) if form.validate_on_submit(): try: - msg = pagure.lib.query.add_token_to_user( + msg = retrieval_queries.add_token_to_user( flask.g.session, project=None, description=form.description.data.strip() or None, @@ -1517,7 +1518,7 @@ def revoke_api_user_token(token_id): url = flask.url_for(".user_settings") return flask.redirect(flask.url_for("auth_login", next=url)) - token = pagure.lib.query.get_api_token(flask.g.session, token_id) + token = retrieval_queries.get_api_token(flask.g.session, token_id) if not token or token.user.username != flask.g.fas_user.username: flask.abort(404, "Token not found") diff --git a/pagure/ui/clone.py b/pagure/ui/clone.py index ce19e50..9411883 100644 --- a/pagure/ui/clone.py +++ b/pagure/ui/clone.py @@ -23,7 +23,7 @@ import pagure.exceptions import pagure.lib.git import pagure.lib.mimetype import pagure.lib.plugins -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks import pagure.forms import pagure.ui.plugins @@ -218,7 +218,7 @@ def clone_proxy(project, username=None, namespace=None): # Anonymous pushing... nope flask.abort(403, "Unauthenticated push not allowed") - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( flask.g.session, project, user=username, diff --git a/pagure/ui/fas_login.py b/pagure/ui/fas_login.py index a9d55ea..cd51ca9 100644 --- a/pagure/ui/fas_login.py +++ b/pagure/ui/fas_login.py @@ -17,7 +17,7 @@ from flask import Markup from sqlalchemy.exc import SQLAlchemyError -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.utils from pagure.flask_app import logout from pagure.config import config as pagure_config @@ -42,13 +42,13 @@ def set_user(return_url): return flask.redirect(return_url) flask.session["_new_user"] = False - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) if not user: flask.session["_new_user"] = True else: - user_email = pagure.lib.query.search_user( + user_email = retrieval_queries.search_user( flask.g.session, email=flask.g.fas_user.email ) if user_email and user_email.user != user.user: @@ -61,7 +61,7 @@ def set_user(return_url): return flask.redirect(return_url) try: - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=flask.g.session, username=flask.g.fas_user.username, fullname=flask.g.fas_user.fullname, @@ -72,7 +72,7 @@ def set_user(return_url): # If groups are managed outside pagure, set up the user at login if not pagure_config.get("ENABLE_GROUP_MNGT", False): - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) groups = set(user.groups) @@ -81,12 +81,12 @@ def set_user(return_url): for group in fas_groups - groups: groupobj = None if group: - groupobj = pagure.lib.query.search_groups( + groupobj = retrieval_queries.search_groups( flask.g.session, group_name=group ) if groupobj: try: - pagure.lib.query.add_user_to_group( + retrieval_queries.add_user_to_group( session=flask.g.session, username=flask.g.fas_user.username, group=groupobj, @@ -100,7 +100,7 @@ def set_user(return_url): for group in groups - fas_groups: if group: try: - pagure.lib.query.delete_user_of_group( + retrieval_queries.delete_user_of_group( session=flask.g.session, username=flask.g.fas_user.username, groupname=group, diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py index 4c5f88b..d98e90d 100644 --- a/pagure/ui/filters.py +++ b/pagure/ui/filters.py @@ -25,7 +25,7 @@ from six.moves.urllib.parse import urlparse, parse_qsl from jinja2 import escape import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.forms from pagure.config import config as pagure_config from pagure.ui import UI_NS @@ -463,7 +463,7 @@ def avatar(packager, size=64, css_class=None): packager = packager.decode("utf-8") if "@" not in packager: - user = pagure.lib.query.search_user(flask.g.session, username=packager) + user = retrieval_queries.search_user(flask.g.session, username=packager) if user: packager = user.default_email @@ -483,7 +483,7 @@ def avatar(packager, size=64, css_class=None): def avatar_url(email, size=64): """ Template filter that returns html for avatar of any given Email. """ - return pagure.lib.query.avatar_url_from_email(email, size) + return retrieval_queries.avatar_url_from_email(email, size) @UI_NS.app_template_filter("short") @@ -497,7 +497,7 @@ def markdown_filter(text): """ Template filter converting a string into html content using the markdown library. """ - return pagure.lib.query.text2markdown(text) + return retrieval_queries.text2markdown(text) @UI_NS.app_template_filter("patch_to_diff") @@ -535,7 +535,7 @@ def author_to_user(author, size=16, cssclass=None, with_name=True): output = escape(author.name) if not author.email: return output - user = pagure.lib.query.search_user(flask.g.session, email=author.email) + user = retrieval_queries.search_user(flask.g.session, email=author.email) if user: output = ( "%(avatar)s by </script> """ - return pagure.lib.query.clean_input(content, ignore=ignore) + return retrieval_queries.clean_input(content, ignore=ignore) @UI_NS.app_template_filter("toRGB") @@ -763,7 +763,7 @@ def user_can_clone_ssh(username): if flask.g.authenticated: has_ssh_keys = ( len( - pagure.lib.query.search_user( + retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ).sshkeys ) diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 1527430..3349c69 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -31,7 +31,7 @@ import pagure.doc_utils import pagure.exceptions import pagure.lib.git import pagure.lib.plugins -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks import pagure.forms from pagure.config import config as pagure_config @@ -80,17 +80,17 @@ def request_pulls(repo, username=None, namespace=None): if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - total_open = pagure.lib.query.search_pull_requests( + total_open = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status=True, count=True ) - total_merged = pagure.lib.query.search_pull_requests( + total_merged = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status="Merged", count=True ) if status.lower() == "merged" or is_true(status, ["false", "0"]): status_filter = "Merged" - requests = pagure.lib.query.search_pull_requests( + requests = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status="Merged", @@ -104,7 +104,7 @@ def request_pulls(repo, username=None, namespace=None): ) elif is_true(status, ["true", "1", "open"]): status_filter = "Open" - requests = pagure.lib.query.search_pull_requests( + requests = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status="Open", @@ -118,7 +118,7 @@ def request_pulls(repo, username=None, namespace=None): ) elif status.lower() == "closed": status_filter = "Closed" - requests = pagure.lib.query.search_pull_requests( + requests = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status="Closed", @@ -132,7 +132,7 @@ def request_pulls(repo, username=None, namespace=None): ) else: status_filter = None - requests = pagure.lib.query.search_pull_requests( + requests = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status=None, @@ -145,7 +145,7 @@ def request_pulls(repo, username=None, namespace=None): limit=flask.g.limit, ) - open_cnt = pagure.lib.query.search_pull_requests( + open_cnt = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status="Open", @@ -155,7 +155,7 @@ def request_pulls(repo, username=None, namespace=None): count=True, ) - merged_cnt = pagure.lib.query.search_pull_requests( + merged_cnt = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status="Merged", @@ -165,7 +165,7 @@ def request_pulls(repo, username=None, namespace=None): count=True, ) - closed_cnt = pagure.lib.query.search_pull_requests( + closed_cnt = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, status="Closed", @@ -238,7 +238,7 @@ def request_pull(repo, requestid, username=None, namespace=None): if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -344,8 +344,8 @@ def request_pull(repo, requestid, username=None, namespace=None): diff_commits=diff_commits, diff=diff, mergeform=form, - subscribers=pagure.lib.query.get_watch_list(flask.g.session, request), - tag_list=pagure.lib.query.get_tags_of_project(flask.g.session, repo), + subscribers=retrieval_queries.get_watch_list(flask.g.session, request), + tag_list=retrieval_queries.get_tags_of_project(flask.g.session, repo), can_delete_branch=can_delete_branch, trigger_ci=trigger_ci, trigger_ci_pr_form=trigger_ci_pr_form, @@ -407,7 +407,7 @@ def request_pull_to_diff_or_patch( if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -515,7 +515,7 @@ def request_pull_edit(repo, requestid, username=None, namespace=None): if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -619,7 +619,7 @@ def pull_request_add_comment( if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -643,7 +643,7 @@ def pull_request_add_comment( trigger_ci = pagure_config["TRIGGER_CI"] if isinstance(trigger_ci, dict): trigger_ci = list(trigger_ci.keys()) - message = pagure.lib.query.add_pull_request_comment( + message = retrieval_queries.add_pull_request_comment( flask.g.session, request=request, commit=commit, @@ -722,7 +722,7 @@ def pull_request_drop_comment(repo, requestid, username=None, namespace=None): if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -743,7 +743,7 @@ def pull_request_drop_comment(repo, requestid, username=None, namespace=None): if flask.request.form.get("drop_comment"): commentid = flask.request.form.get("drop_comment") - comment = pagure.lib.query.get_request_comment( + comment = retrieval_queries.get_request_comment( flask.g.session, request.uid, commentid ) if comment is None or comment.pull_request.project != repo: @@ -813,14 +813,14 @@ def pull_request_edit_comment( if not project.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=project.id, requestid=requestid ) if not request: flask.abort(404, "Pull-request not found") - comment = pagure.lib.query.get_request_comment( + comment = retrieval_queries.get_request_comment( flask.g.session, request.uid, commentid ) @@ -839,7 +839,7 @@ def pull_request_edit_comment( updated_comment = form.update_comment.data try: - message = pagure.lib.query.edit_comment( + message = retrieval_queries.edit_comment( flask.g.session, parent=request, comment=comment, @@ -908,7 +908,7 @@ def reopen_request_pull(repo, requestid, username=None, namespace=None): if not flask.g.repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=flask.g.repo.id, requestid=requestid ) @@ -925,7 +925,7 @@ def reopen_request_pull(repo, requestid, username=None, namespace=None): ) try: - pagure.lib.query.reopen_pull_request( + retrieval_queries.reopen_pull_request( flask.g.session, request, flask.g.fas_user.username ) except pagure.exceptions.PagureException as err: @@ -991,7 +991,7 @@ def ci_trigger_request_pull(repo, requestid, username=None, namespace=None): ) repo_obj = flask.g.repo - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo_obj.id, requestid=requestid ) @@ -1001,7 +1001,7 @@ def ci_trigger_request_pull(repo, requestid, username=None, namespace=None): trigger_ci = pagure_config["TRIGGER_CI"] if isinstance(trigger_ci, dict): trigger_ci = list(trigger_ci.keys()) - pagure.lib.query.add_pull_request_comment( + retrieval_queries.add_pull_request_comment( flask.g.session, request, commit=None, @@ -1067,7 +1067,7 @@ def merge_request_pull(repo, requestid, username=None, namespace=None): if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -1241,7 +1241,7 @@ def cancel_request_pull(repo, requestid, username=None, namespace=None): if not flask.g.repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=flask.g.repo.id, requestid=requestid ) @@ -1257,7 +1257,7 @@ def cancel_request_pull(repo, requestid, username=None, namespace=None): "You are not allowed to cancel pull-request for this project", ) - pagure.lib.query.close_pull_request( + retrieval_queries.close_pull_request( flask.g.session, request, flask.g.fas_user.username, merged=False ) try: @@ -1307,7 +1307,7 @@ def refresh_request_pull(repo, requestid, username=None, namespace=None): if not flask.g.repo.settings.get("pull_requests", True): flask.abort(404, "No pull-requests found for this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=flask.g.repo.id, requestid=requestid ) @@ -1369,7 +1369,7 @@ def update_pull_requests(repo, requestid, username=None, namespace=None): if not repo.settings.get("pull_requests", True): flask.abort(404, "No pull-request allowed on this project") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, project_id=repo.id, requestid=requestid ) @@ -1393,7 +1393,7 @@ def update_pull_requests(repo, requestid, username=None, namespace=None): messages = set() try: # Adjust (add/remove) tags - msgs = pagure.lib.query.update_tags( + msgs = retrieval_queries.update_tags( flask.g.session, obj=request, tags=tags, @@ -1403,7 +1403,7 @@ def update_pull_requests(repo, requestid, username=None, namespace=None): if flask.g.repo_committer: # Assign or update assignee of the ticket - msg = pagure.lib.query.add_pull_request_assignee( + msg = retrieval_queries.add_pull_request_assignee( flask.g.session, request=request, assignee=flask.request.form.get("user", "").strip() @@ -1416,7 +1416,7 @@ def update_pull_requests(repo, requestid, username=None, namespace=None): if messages: # Add the comment for field updates: not_needed = set(["Comment added", "Updated comment"]) - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=request, messages=messages - not_needed, @@ -1464,7 +1464,7 @@ def fork_project(repo, username=None, namespace=None): if not form.validate_on_submit(): flask.abort(400) - if pagure.lib.query._get_project( + if retrieval_queries._get_project( flask.g.session, repo.name, user=flask.g.fas_user.username, @@ -1480,7 +1480,7 @@ def fork_project(repo, username=None, namespace=None): ) try: - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=flask.g.session, repo=repo, user=flask.g.fas_user.username ) @@ -1579,13 +1579,13 @@ def new_request_pull( p_namespace, p_name = left.split("/", 1) else: p_name = left - parent = pagure.lib.query.get_authorized_project( + parent = retrieval_queries.get_authorized_project( flask.g.session, p_name, user=p_username, namespace=p_namespace ) if parent: family = [ p.url_path - for p in pagure.lib.query.get_project_family( + for p in retrieval_queries.get_project_family( flask.g.session, repo ) ] @@ -1640,7 +1640,7 @@ def new_request_pull( if diff_commits: commit_stop = diff_commits[0].oid.hex commit_start = diff_commits[-1].oid.hex - request = pagure.lib.query.new_pull_request( + request = retrieval_queries.new_pull_request( flask.g.session, repo_to=parent, branch_to=branch_to, @@ -1867,7 +1867,7 @@ def new_remote_request_pull(repo, username=None, namespace=None): if repo.parent: parent = repo.parent - request = pagure.lib.query.new_pull_request( + request = retrieval_queries.new_pull_request( flask.g.session, repo_to=parent, branch_to=branch_to, @@ -1879,7 +1879,7 @@ def new_remote_request_pull(repo, username=None, namespace=None): ) if form.initial_comment.data.strip() != "": - pagure.lib.query.add_pull_request_comment( + retrieval_queries.add_pull_request_comment( flask.g.session, request=request, commit=None, @@ -1973,7 +1973,7 @@ def fork_edit_file(repo, branchname, filename, username=None, namespace=None): if not form.validate_on_submit(): flask.abort(400) - if pagure.lib.query._get_project( + if retrieval_queries._get_project( flask.g.session, repo.name, namespace=repo.namespace, @@ -1992,7 +1992,7 @@ def fork_edit_file(repo, branchname, filename, username=None, namespace=None): ) try: - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=flask.g.session, repo=repo, user=flask.g.fas_user.username, @@ -2055,14 +2055,14 @@ def pull_request_comment_add_reaction( if not form.validate_on_submit(): flask.abort(400, "CSRF token not valid") - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( flask.g.session, requestid=requestid, project_id=repo.id ) if not request: flask.abort(404, "Comment not found") - comment = pagure.lib.query.get_request_comment( + comment = retrieval_queries.get_request_comment( flask.g.session, request.uid, commentid ) diff --git a/pagure/ui/groups.py b/pagure/ui/groups.py index bb7139e..aba0053 100644 --- a/pagure/ui/groups.py +++ b/pagure/ui/groups.py @@ -17,7 +17,7 @@ from sqlalchemy.exc import SQLAlchemyError import pagure.forms import pagure.lib.git -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config from pagure.ui import UI_NS from pagure.utils import login_required @@ -34,7 +34,7 @@ def group_lists(): group_type = "user" if pagure.utils.is_admin(): group_type = None - groups = pagure.lib.query.search_groups( + groups = retrieval_queries.search_groups( flask.g.session, group_type=group_type ) @@ -42,7 +42,7 @@ def group_lists(): if pagure.utils.is_admin(): group_types = [ grp.group_type - for grp in pagure.lib.query.get_group_types(flask.g.session) + for grp in retrieval_queries.get_group_types(flask.g.session) ] # Make sure the admin type is always the last one group_types.remove("admin") @@ -65,7 +65,7 @@ def view_group(group): group_type = "user" if pagure.utils.is_admin(): group_type = None - group = pagure.lib.query.search_groups( + group = retrieval_queries.search_groups( flask.g.session, group_name=group, group_type=group_type ) @@ -83,7 +83,7 @@ def view_group(group): username = form.user.data try: - msg = pagure.lib.query.add_user_to_group( + msg = retrieval_queries.add_user_to_group( flask.g.session, username=username, group=group, @@ -115,7 +115,7 @@ def view_group(group): member = False if flask.g.authenticated: - member = pagure.lib.query.is_group_member( + member = retrieval_queries.is_group_member( flask.g.session, flask.g.fas_user.username, group.group_name ) @@ -136,7 +136,7 @@ def edit_group(group): is_admin = pagure.utils.is_admin() if is_admin: group_type = None - group = pagure.lib.query.search_groups( + group = retrieval_queries.search_groups( flask.g.session, group_name=group, group_type=group_type ) @@ -148,7 +148,7 @@ def edit_group(group): if form.validate_on_submit(): try: - msg = pagure.lib.query.edit_group_info( + msg = retrieval_queries.edit_group_info( flask.g.session, group=group, display_name=form.display_name.data, @@ -195,7 +195,7 @@ def group_user_delete(user, group): if form.validate_on_submit(): try: - pagure.lib.query.delete_user_of_group( + retrieval_queries.delete_user_of_group( flask.g.session, username=user, groupname=group, @@ -241,7 +241,7 @@ def group_delete(group): form = pagure.forms.ConfirmationForm() if form.validate_on_submit(): - group_obj = pagure.lib.query.search_groups( + group_obj = retrieval_queries.search_groups( flask.g.session, group_name=group ) @@ -249,7 +249,7 @@ def group_delete(group): flask.flash("No group `%s` found" % group, "error") return flask.redirect(flask.url_for("ui_ns.group_lists")) - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) if not user: @@ -282,7 +282,7 @@ def add_group(): if not pagure_config.get("ENABLE_GROUP_MNGT", False): flask.abort(404) - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) if not user: # pragma: no cover @@ -292,7 +292,7 @@ def add_group(): if pagure.utils.is_admin(): group_types = [ grp.group_type - for grp in pagure.lib.query.get_group_types(flask.g.session) + for grp in retrieval_queries.get_group_types(flask.g.session) ] # Make sure the admin type is always the last one group_types.remove("admin") @@ -310,7 +310,7 @@ def add_group(): display_name = form.display_name.data.strip() description = form.description.data.strip() - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( session=flask.g.session, group_name=group_name, display_name=display_name, diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index fa7a12c..6f52d75 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -30,7 +30,7 @@ from binaryornot.helpers import is_binary_string import pagure.doc_utils import pagure.exceptions -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.mimetype from pagure.decorators import has_issue_tracker, is_repo_admin @@ -94,7 +94,7 @@ def update_issue(repo, issueid, username=None, namespace=None): ) ) - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, repo, issueid=issueid ) @@ -121,7 +121,7 @@ def update_issue(repo, issueid, username=None, namespace=None): repo.name, issueid, commentid, username=username ) - status = pagure.lib.query.get_issue_statuses(flask.g.session) + status = retrieval_queries.get_issue_statuses(flask.g.session) form = pagure.forms.UpdateIssueForm( status=status, priorities=repo.priorities, @@ -137,7 +137,7 @@ def update_issue(repo, issueid, username=None, namespace=None): if flask.request.form.get("drop_comment"): commentid = flask.request.form.get("drop_comment") - comment = pagure.lib.query.get_issue_comment( + comment = retrieval_queries.get_issue_comment( flask.g.session, issue.uid, commentid ) if comment is None or comment.issue.project != repo: @@ -226,7 +226,7 @@ def update_issue(repo, issueid, username=None, namespace=None): # Update status if is_contributor or is_author: if new_status in status: - msgs = pagure.lib.query.edit_issue( + msgs = retrieval_queries.edit_issue( flask.g.session, issue=issue, status=new_status, @@ -244,7 +244,7 @@ def update_issue(repo, issueid, username=None, namespace=None): # reset if we let them if is_contributor or is_open_access: # Adjust (add/remove) tags - msgs = pagure.lib.query.update_tags( + msgs = retrieval_queries.update_tags( flask.g.session, issue, tags, @@ -257,7 +257,7 @@ def update_issue(repo, issueid, username=None, namespace=None): # let them # Assign or update assignee of the ticket - message = pagure.lib.query.add_issue_assignee( + message = retrieval_queries.add_issue_assignee( flask.g.session, issue=issue, assignee=assignee or None, @@ -272,7 +272,7 @@ def update_issue(repo, issueid, username=None, namespace=None): new_priority = None # Update core metadata - msgs = pagure.lib.query.edit_issue( + msgs = retrieval_queries.edit_issue( flask.g.session, repo=repo, issue=issue, @@ -300,7 +300,7 @@ def update_issue(repo, issueid, username=None, namespace=None): % (key.name, link), ) - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( flask.g.session, issue, key, value ) if key.key_notify and msg is not None: @@ -312,7 +312,7 @@ def update_issue(repo, issueid, username=None, namespace=None): messages.add(msg) # Update ticket this one depends on - msgs = pagure.lib.query.update_dependency_issue( + msgs = retrieval_queries.update_dependency_issue( flask.g.session, repo, issue, @@ -322,7 +322,7 @@ def update_issue(repo, issueid, username=None, namespace=None): messages = messages.union(set(msgs)) # Update ticket(s) depending on this one - msgs = pagure.lib.query.update_blocked_issue( + msgs = retrieval_queries.update_blocked_issue( flask.g.session, repo, issue, @@ -335,7 +335,7 @@ def update_issue(repo, issueid, username=None, namespace=None): # New comment if comment: - message = pagure.lib.query.add_issue_comment( + message = retrieval_queries.add_issue_comment( flask.g.session, issue=issue, comment=comment, @@ -355,7 +355,7 @@ def update_issue(repo, issueid, username=None, namespace=None): # Add the comment for field updates: if messages: not_needed = set(["Comment added", "Updated comment"]) - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=issue, messages=messages - not_needed, @@ -423,7 +423,7 @@ def issue_comment_add_reaction( """Add a reaction to a comment of an issue""" repo = flask.g.repo - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, repo, issueid=issueid ) @@ -444,7 +444,7 @@ def issue_comment_add_reaction( ): flask.abort(404, "No such issue") - comment = pagure.lib.query.get_issue_comment( + comment = retrieval_queries.get_issue_comment( flask.g.session, issue.uid, commentid ) @@ -526,7 +526,7 @@ def view_issues(repo, username=None, namespace=None): milestones.remove("none") search_string = search_pattern - extra_fields, search_pattern = pagure.lib.query.tokenize_search_string( + extra_fields, search_pattern = retrieval_queries.tokenize_search_string( search_pattern ) @@ -548,11 +548,11 @@ def view_issues(repo, username=None, namespace=None): if flask.g.repo_committer: private = None - total_closed = pagure.lib.query.search_issues( + total_closed = retrieval_queries.search_issues( flask.g.session, repo, status="Closed", private=private, count=True ) - total_open = pagure.lib.query.search_issues( + total_open = retrieval_queries.search_issues( flask.g.session, repo, status="Open", private=private, count=True ) @@ -563,7 +563,7 @@ def view_issues(repo, username=None, namespace=None): status = None oth_issues_cnt = None - total_issues_cnt = pagure.lib.query.search_issues( + total_issues_cnt = retrieval_queries.search_issues( flask.g.session, repo, private=private, count=True, **fields ) @@ -576,7 +576,7 @@ def view_issues(repo, username=None, namespace=None): status = status.capitalize() status_count = "Closed" other_status_count = "Open" - close_status_cnt = pagure.lib.query.search_issues( + close_status_cnt = retrieval_queries.search_issues( flask.g.session, repo, private=private, @@ -597,7 +597,7 @@ def view_issues(repo, username=None, namespace=None): status_count = "Closed" other_status_count = "Open" - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( flask.g.session, repo, private=private, @@ -611,7 +611,7 @@ def view_issues(repo, username=None, namespace=None): status=status, **fields ) - issues_cnt = pagure.lib.query.search_issues( + issues_cnt = retrieval_queries.search_issues( flask.g.session, repo, private=private, @@ -622,7 +622,7 @@ def view_issues(repo, username=None, namespace=None): status=status_count, **fields ) - oth_issues_cnt = pagure.lib.query.search_issues( + oth_issues_cnt = retrieval_queries.search_issues( flask.g.session, repo, private=private, @@ -634,7 +634,7 @@ def view_issues(repo, username=None, namespace=None): **fields ) else: - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( flask.g.session, repo, private=private, @@ -646,7 +646,7 @@ def view_issues(repo, username=None, namespace=None): order_key=order_key, **fields ) - issues_cnt = pagure.lib.query.search_issues( + issues_cnt = retrieval_queries.search_issues( flask.g.session, repo, private=private, @@ -655,7 +655,7 @@ def view_issues(repo, username=None, namespace=None): count=True, **fields ) - oth_issues_cnt = pagure.lib.query.search_issues( + oth_issues_cnt = retrieval_queries.search_issues( flask.g.session, repo, private=private, @@ -666,7 +666,7 @@ def view_issues(repo, username=None, namespace=None): status="Open", **fields ) - tag_list = pagure.lib.query.get_tags_of_project(flask.g.session, repo) + tag_list = retrieval_queries.get_tags_of_project(flask.g.session, repo) total_page = 1 @@ -759,7 +759,7 @@ def view_roadmap(repo, username=None, namespace=None): ): milestones_list.append(key) - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( flask.g.session, repo, milestones=milestones_list, @@ -826,7 +826,7 @@ def view_milestone(repo, username=None, namespace=None, milestone=None): if flask.g.repo_committer: private = None - open_issues = pagure.lib.query.search_issues( + open_issues = retrieval_queries.search_issues( flask.g.session, repo, milestones=[milestone], @@ -834,7 +834,7 @@ def view_milestone(repo, username=None, namespace=None, milestone=None): status="Open", ) - closed_issues = pagure.lib.query.search_issues( + closed_issues = retrieval_queries.search_issues( flask.g.session, repo, milestones=[milestone], @@ -891,7 +891,7 @@ def new_issue(repo, username=None, namespace=None): private = form.private.data try: - user_obj = pagure.lib.query.get_user( + user_obj = retrieval_queries.get_user( flask.g.session, flask.g.fas_user.username ) except pagure.exceptions.PagureException: @@ -923,7 +923,7 @@ def new_issue(repo, username=None, namespace=None): if tag.strip() ] - issue = pagure.lib.query.new_issue( + issue = retrieval_queries.new_issue( flask.g.session, repo=repo, title=title, @@ -944,7 +944,7 @@ def new_issue(repo, username=None, namespace=None): n_img = issue.content.count("") if n_img == len(streams): for filestream in streams: - new_filename = pagure.lib.query.add_attachment( + new_filename = retrieval_queries.add_attachment( repo=repo, issue=issue, attachmentfolder=pagure_config[ @@ -1018,7 +1018,7 @@ def new_issue(repo, username=None, namespace=None): default_file.data, "md" ) - tag_list = pagure.lib.query.get_tags_of_project(flask.g.session, repo) + tag_list = retrieval_queries.get_tags_of_project(flask.g.session, repo) if flask.request.method == "GET": form.private.data = repo.settings.get( "issues_default_to_private", False @@ -1062,7 +1062,7 @@ def view_issue(repo, issueid, username=None, namespace=None): repo = flask.g.repo - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, repo, issueid=issueid ) @@ -1078,7 +1078,7 @@ def view_issue(repo, issueid, username=None, namespace=None): ): flask.abort(404, "Issue not found") - status = pagure.lib.query.get_issue_statuses(flask.g.session) + status = retrieval_queries.get_issue_statuses(flask.g.session) milestones = [] for m in repo.milestones_keys or repo.milestones: if m in repo.milestones and repo.milestones[m]["active"]: @@ -1099,7 +1099,7 @@ def view_issue(repo, issueid, username=None, namespace=None): form.close_status.data = "" if issue.close_status: form.close_status.data = issue.close_status - tag_list = pagure.lib.query.get_tags_of_project(flask.g.session, repo) + tag_list = retrieval_queries.get_tags_of_project(flask.g.session, repo) knowns_keys = {} for key in issue.other_fields: @@ -1118,7 +1118,7 @@ def view_issue(repo, issueid, username=None, namespace=None): form=form, knowns_keys=knowns_keys, open_access=open_access, - subscribers=pagure.lib.query.get_watch_list(flask.g.session, issue), + subscribers=retrieval_queries.get_watch_list(flask.g.session, issue), attachments=issue.attachments, ) @@ -1139,7 +1139,7 @@ def delete_issue(repo, issueid, username=None, namespace=None): repo = flask.g.repo - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, repo, issueid=issueid ) @@ -1154,7 +1154,7 @@ def delete_issue(repo, issueid, username=None, namespace=None): form = pagure.forms.ConfirmationForm() if form.validate_on_submit(): try: - pagure.lib.query.drop_issue( + retrieval_queries.drop_issue( flask.g.session, issue, user=flask.g.fas_user.username ) flask.g.session.commit() @@ -1213,7 +1213,7 @@ def edit_issue(repo, issueid, username=None, namespace=None): """ repo = flask.g.repo - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, repo, issueid=issueid ) @@ -1226,7 +1226,7 @@ def edit_issue(repo, issueid, username=None, namespace=None): ): flask.abort(403, "You are not allowed to edit issues for this project") - status = pagure.lib.query.get_issue_statuses(flask.g.session) + status = retrieval_queries.get_issue_statuses(flask.g.session) form = pagure.forms.IssueForm(status=status) if form.validate_on_submit(): title = form.title.data @@ -1235,7 +1235,7 @@ def edit_issue(repo, issueid, username=None, namespace=None): private = form.private.data try: - user_obj = pagure.lib.query.get_user( + user_obj = retrieval_queries.get_user( flask.g.session, flask.g.fas_user.username ) except pagure.exceptions.PagureException: @@ -1246,7 +1246,7 @@ def edit_issue(repo, issueid, username=None, namespace=None): ) try: - messages = pagure.lib.query.edit_issue( + messages = retrieval_queries.edit_issue( flask.g.session, issue=issue, title=title, @@ -1257,7 +1257,7 @@ def edit_issue(repo, issueid, username=None, namespace=None): ) flask.g.session.commit() if messages: - pagure.lib.query.add_metadata_update_notif( + retrieval_queries.add_metadata_update_notif( session=flask.g.session, obj=issue, messages=messages, @@ -1267,7 +1267,7 @@ def edit_issue(repo, issueid, username=None, namespace=None): # If there is a file attached, attach it. filestream = flask.request.files.get("filestream") if filestream and "" in issue.content: - new_filename = pagure.lib.query.add_attachment( + new_filename = retrieval_queries.add_attachment( repo=repo, issue=issue, attachmentfolder=pagure_config["ATTACHMENTS_FOLDER"], @@ -1347,7 +1347,7 @@ def upload_issue(repo, issueid, username=None, namespace=None): """ repo = flask.g.repo - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, repo, issueid=issueid ) @@ -1355,7 +1355,7 @@ def upload_issue(repo, issueid, username=None, namespace=None): flask.abort(404, "Issue not found") try: - user_obj = pagure.lib.query.get_user( + user_obj = retrieval_queries.get_user( flask.g.session, flask.g.fas_user.username ) except pagure.exceptions.PagureException: @@ -1370,7 +1370,7 @@ def upload_issue(repo, issueid, username=None, namespace=None): if form.validate_on_submit(): filenames = [] for filestream in flask.request.files.getlist("filestream"): - new_filename = pagure.lib.query.add_attachment( + new_filename = retrieval_queries.add_attachment( repo=repo, issue=issue, attachmentfolder=pagure_config["ATTACHMENTS_FOLDER"], @@ -1506,14 +1506,14 @@ def edit_comment_issue( project = flask.g.repo - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( flask.g.session, project, issueid=issueid ) if issue is None or issue.project != project: flask.abort(404, "Issue not found") - comment = pagure.lib.query.get_issue_comment( + comment = retrieval_queries.get_issue_comment( flask.g.session, issue.uid, commentid ) @@ -1532,7 +1532,7 @@ def edit_comment_issue( updated_comment = form.update_comment.data try: - message = pagure.lib.query.edit_comment( + message = retrieval_queries.edit_comment( flask.g.session, parent=issue, comment=comment, @@ -1602,7 +1602,7 @@ def save_reports(repo, username=None, namespace=None): name = form.report_name.data try: - msg = pagure.lib.query.save_report( + msg = retrieval_queries.save_report( flask.g.session, flask.g.repo, name=name, diff --git a/pagure/ui/login.py b/pagure/ui/login.py index 2babfa4..ddd37d6 100644 --- a/pagure/ui/login.py +++ b/pagure/ui/login.py @@ -23,7 +23,7 @@ import pagure.login_forms as forms import pagure.lib.login import pagure.lib.model as model import pagure.lib.notify -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.utils import login_required from pagure.lib.login import generate_hashed_value, check_password from pagure.ui import UI_NS @@ -41,12 +41,12 @@ def new_user(): if form.validate_on_submit(): username = form.user.data - if pagure.lib.query.search_user(flask.g.session, username=username): + if retrieval_queries.search_user(flask.g.session, username=username): flask.flash("Username already taken.", "error") return flask.redirect(flask.request.url) email = form.email_address.data - if pagure.lib.query.search_user(flask.g.session, email=email): + if retrieval_queries.search_user(flask.g.session, email=email): flask.flash("Email address already taken.", "error") return flask.redirect(flask.request.url) @@ -62,7 +62,7 @@ def new_user(): flask.g.session.flush() try: - pagure.lib.query.add_email_to_user( + retrieval_queries.add_email_to_user( flask.g.session, user, form.email_address.data ) flask.g.session.commit() @@ -97,7 +97,7 @@ def do_login(): if form.validate_on_submit(): username = form.username.data - user_obj = pagure.lib.query.search_user( + user_obj = retrieval_queries.search_user( flask.g.session, username=username ) if not user_obj: @@ -171,7 +171,7 @@ def do_login(): def confirm_user(token): """ Confirm a user account. """ - user_obj = pagure.lib.query.search_user(flask.g.session, token=token) + user_obj = retrieval_queries.search_user(flask.g.session, token=token) if not user_obj: flask.flash("No user associated with this token.", "error") else: @@ -203,7 +203,7 @@ def lost_password(): if form.validate_on_submit(): username = form.username.data - user_obj = pagure.lib.query.search_user( + user_obj = retrieval_queries.search_user( flask.g.session, username=username ) if not user_obj: @@ -251,7 +251,7 @@ def reset_password(token): """ form = forms.ResetPasswordForm() - user_obj = pagure.lib.query.search_user(flask.g.session, token=token) + user_obj = retrieval_queries.search_user(flask.g.session, token=token) if not user_obj: flask.flash("No user associated with this token.", "error") return flask.redirect(flask.url_for("auth_login")) @@ -297,7 +297,7 @@ def change_password(): """ form = forms.ChangePasswordForm() - user_obj = pagure.lib.query.search_user( + user_obj = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) @@ -435,7 +435,7 @@ def _check_session_cookie(): """ Set the user into flask.g if the user is logged in. """ if not hasattr(flask.g, "session") or not flask.g.session: - flask.g.session = pagure.lib.query.create_session( + flask.g.session = retrieval_queries.create_session( flask.current_app.config["DB_URL"] ) diff --git a/pagure/ui/oidc_login.py b/pagure/ui/oidc_login.py index e05ecbe..fde5e19 100644 --- a/pagure/ui/oidc_login.py +++ b/pagure/ui/oidc_login.py @@ -17,7 +17,7 @@ from flask import Markup import munch from sqlalchemy.exc import SQLAlchemyError -import pagure.lib.query +from pagure.lib import retrieval_queries from pagure.config import config as pagure_config from pagure.flask_app import logout from pagure.utils import is_admin @@ -74,13 +74,13 @@ def set_user(): return flask.session["_new_user"] = False - if not pagure.lib.query.search_user( + if not retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ): flask.session["_new_user"] = True try: - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=flask.g.session, username=flask.g.fas_user.username, fullname=flask.g.fas_user.fullname, @@ -91,7 +91,7 @@ def set_user(): # If groups are managed outside pagure, set up the user at login if not pagure_config.get("ENABLE_GROUP_MNGT", False): - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) old_groups = set(user.groups) @@ -100,12 +100,12 @@ def set_user(): for group in fas_groups - old_groups: groupobj = None if group: - groupobj = pagure.lib.query.search_groups( + groupobj = retrieval_queries.search_groups( flask.g.session, group_name=group ) if groupobj: try: - pagure.lib.query.add_user_to_group( + retrieval_queries.add_user_to_group( session=flask.g.session, username=flask.g.fas_user.username, group=groupobj, @@ -119,7 +119,7 @@ def set_user(): for group in old_groups - fas_groups: if group: try: - pagure.lib.query.delete_user_of_group( + retrieval_queries.delete_user_of_group( session=flask.g.session, username=flask.g.fas_user.username, groupname=group, diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 73ddfae..70123b7 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -42,7 +42,7 @@ import pagure.exceptions import pagure.lib.git import pagure.lib.mimetype import pagure.lib.plugins -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks import pagure.forms import pagure.ui.plugins @@ -144,7 +144,7 @@ def view_repo(repo, username=None, namespace=None): branchname = repo_obj.head.shorthand else: branchname = None - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( flask.g.session, repo, user=username, namespace=namespace ) watch_users = set() @@ -340,7 +340,7 @@ def view_commits(repo, branchname=None, username=None, namespace=None): author_obj = None if author: try: - author_obj = pagure.lib.query.get_user(flask.g.session, author) + author_obj = retrieval_queries.get_user(flask.g.session, author) except pagure.exceptions.PagureException: pass if not author_obj: @@ -846,7 +846,7 @@ def view_commit(repo, commitid, username=None, namespace=None): commit=commit, diff=diff, splitview=splitview, - flags=pagure.lib.query.get_commit_flag( + flags=retrieval_queries.get_commit_flag( flask.g.session, repo, commitid ), ) @@ -1188,7 +1188,7 @@ def view_settings(repo, username=None, namespace=None): plugins = pagure.lib.plugins.get_plugin_names( pagure_config.get("DISABLED_PLUGINS") ) - tags = pagure.lib.query.get_tags_of_project(flask.g.session, repo) + tags = retrieval_queries.get_tags_of_project(flask.g.session, repo) form = pagure.forms.ConfirmationForm() tag_form = pagure.forms.AddIssueTagForm() @@ -1207,7 +1207,7 @@ def view_settings(repo, username=None, namespace=None): settings[key] = flask.request.form[key] try: - message = pagure.lib.query.update_project_settings( + message = retrieval_queries.update_project_settings( flask.g.session, repo=repo, settings=settings, @@ -1322,7 +1322,7 @@ def update_project(repo, username=None, namespace=None): repo.url = form.url.data.strip() if repo.private: repo.private = form.private.data - pagure.lib.query.update_tags( + retrieval_queries.update_tags( flask.g.session, repo, tags=[t.strip() for t in form.tags.data.split(",")], @@ -1755,7 +1755,7 @@ def remove_deploykey(repo, keyid, username=None, namespace=None): try: flask.g.session.commit() - pagure.lib.query.create_deploykeys_ssh_keys_on_disk( + retrieval_queries.create_deploykeys_ssh_keys_on_disk( repo, pagure_config.get("GITOLITE_KEYDIR", None) ) pagure.lib.tasks.gitolite_post_compile_only.delay() @@ -1799,11 +1799,11 @@ def remove_user(repo, userid, username=None, namespace=None): delete_themselves = False if form.validate_on_submit(): try: - user = pagure.lib.query.get_user_by_id( + user = retrieval_queries.get_user_by_id( flask.g.session, int(userid) ) delete_themselves = user.username == flask.g.fas_user.username - msg = pagure.lib.query.remove_user_of_project( + msg = retrieval_queries.remove_user_of_project( flask.g.session, user, repo, flask.g.fas_user.username ) flask.flash(msg) @@ -1866,7 +1866,7 @@ def add_deploykey(repo, username=None, namespace=None): if form.validate_on_submit(): user = _get_user(username=flask.g.fas_user.username) try: - msg = pagure.lib.query.add_sshkey_to_project_or_user( + msg = retrieval_queries.add_sshkey_to_project_or_user( flask.g.session, ssh_key=form.ssh_key.data, creator=user, @@ -1874,7 +1874,7 @@ def add_deploykey(repo, username=None, namespace=None): pushaccess=form.pushaccess.data, ) flask.g.session.commit() - pagure.lib.query.create_deploykeys_ssh_keys_on_disk( + retrieval_queries.create_deploykeys_ssh_keys_on_disk( repo, pagure_config.get("GITOLITE_KEYDIR", None) ) pagure.lib.tasks.gitolite_post_compile_only.delay() @@ -1932,10 +1932,10 @@ def add_user(repo, username=None, namespace=None): user_to_update_obj = None user_access = None if user_to_update: - user_to_update_obj = pagure.lib.query.search_user( + user_to_update_obj = retrieval_queries.search_user( flask.g.session, username=user_to_update ) - user_access = pagure.lib.query.get_obj_access( + user_access = retrieval_queries.get_obj_access( flask.g.session, repo, user_to_update_obj ) @@ -1948,7 +1948,7 @@ def add_user(repo, username=None, namespace=None): if form.validate_on_submit(): try: - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( flask.g.session, repo, new_user=form.user.data, @@ -1977,7 +1977,7 @@ def add_user(repo, username=None, namespace=None): _log.exception(err) flask.flash("User could not be added", "error") - access_levels = pagure.lib.query.get_access_levels(flask.g.session) + access_levels = retrieval_queries.get_access_levels(flask.g.session) return flask.render_template( "add_user.html", form=form, @@ -2036,7 +2036,7 @@ def remove_group_project(repo, groupid, username=None, namespace=None): break try: # Mark the project as read_only, celery will unmark it - pagure.lib.query.update_read_only_mode( + retrieval_queries.update_read_only_mode( flask.g.session, repo, read_only=True ) flask.g.session.commit() @@ -2088,10 +2088,10 @@ def add_group_project(repo, username=None, namespace=None): group_to_update_obj = None group_access = None if group_to_update: - group_to_update_obj = pagure.lib.query.search_groups( + group_to_update_obj = retrieval_queries.search_groups( flask.g.session, group_name=group_to_update ) - group_access = pagure.lib.query.get_obj_access( + group_access = retrieval_queries.get_obj_access( flask.g.session, repo, group_to_update_obj ) @@ -2104,7 +2104,7 @@ def add_group_project(repo, username=None, namespace=None): if form.validate_on_submit(): try: - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( flask.g.session, repo, new_group=form.group.data, @@ -2134,7 +2134,7 @@ def add_group_project(repo, username=None, namespace=None): _log.exception(err) flask.flash("Group could not be added", "error") - access_levels = pagure.lib.query.get_access_levels(flask.g.session) + access_levels = retrieval_queries.get_access_levels(flask.g.session) return flask.render_template( "add_group_project.html", form=form, @@ -2241,14 +2241,14 @@ def add_token(repo, username=None, namespace=None): 403, "You are not allowed to change the settings for this project" ) - acls = pagure.lib.query.get_acls( + acls = retrieval_queries.get_acls( flask.g.session, restrict=pagure_config.get("USER_ACLS") ) form = pagure.forms.NewTokenForm(acls=acls) if form.validate_on_submit(): try: - msg = pagure.lib.query.add_token_to_user( + msg = retrieval_queries.add_token_to_user( flask.g.session, repo, description=form.description.data.strip() or None, @@ -2303,7 +2303,7 @@ def renew_api_token(repo, token_id, username=None, namespace=None): repo = flask.g.repo - token = pagure.lib.query.get_api_token(flask.g.session, token_id) + token = retrieval_queries.get_api_token(flask.g.session, token_id) if ( not token @@ -2317,7 +2317,7 @@ def renew_api_token(repo, token_id, username=None, namespace=None): if form.validate_on_submit(): acls = [acl.name for acl in token.acls] try: - msg = pagure.lib.query.add_token_to_user( + msg = retrieval_queries.add_token_to_user( flask.g.session, repo, description=token.description or None, @@ -2369,7 +2369,7 @@ def revoke_api_token(repo, token_id, username=None, namespace=None): repo = flask.g.repo - token = pagure.lib.query.get_api_token(flask.g.session, token_id) + token = retrieval_queries.get_api_token(flask.g.session, token_id) if ( not token @@ -2431,7 +2431,7 @@ def edit_file(repo, branchname, filename, username=None, namespace=None): repo = flask.g.repo repo_obj = flask.g.repo_obj - user = pagure.lib.query.search_user( + user = retrieval_queries.search_user( flask.g.session, username=flask.g.fas_user.username ) @@ -2637,7 +2637,7 @@ def star_project(repo, star, username=None, namespace=None): flask.abort(400) try: - msg = pagure.lib.query.update_star_project( + msg = retrieval_queries.update_star_project( flask.g.session, user=flask.g.fas_user.username, repo=flask.g.repo, @@ -2677,7 +2677,7 @@ def watch_repo(repo, watch, username=None, namespace=None): flask.abort(400) try: - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( flask.g.session, flask.g.repo, flask.g.fas_user.username, watch ) flask.g.session.commit() @@ -2874,7 +2874,7 @@ def update_custom_keys(repo, username=None, namespace=None): ) try: - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( flask.g.session, repo, custom_keys, @@ -3033,14 +3033,14 @@ def give_project(repo, username=None, namespace=None): new_username = flask.request.form.get("user", "").strip() if not new_username: flask.abort(404, "No user specified") - new_owner = pagure.lib.query.search_user( + new_owner = retrieval_queries.search_user( flask.g.session, username=new_username ) if not new_owner: flask.abort(404, "No such user %s found" % new_username) try: old_main_admin = repo.user.user - pagure.lib.query.set_project_owner( + retrieval_queries.set_project_owner( flask.g.session, repo, new_owner, @@ -3049,7 +3049,7 @@ def give_project(repo, username=None, namespace=None): # If the person doing the action is the former main admin, keep # them as admins if flask.g.fas_user.username == old_main_admin: - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( flask.g.session, repo, new_user=flask.g.fas_user.username, @@ -3201,7 +3201,7 @@ def update_tags(repo, username=None, namespace=None): flask.flash("Duplicated tag: %s" % tag, "error") break try: - pagure.lib.query.new_tag( + retrieval_queries.new_tag( flask.g.session, tag, tag_descriptions[idx], @@ -3242,7 +3242,7 @@ def remove_tag(repo, username=None, namespace=None): tags = form.tag.data tags = [tag.strip() for tag in tags.split(",")] - msgs = pagure.lib.query.remove_tags( + msgs = retrieval_queries.remove_tags( flask.g.session, repo, tags, user=flask.g.fas_user.username ) @@ -3290,12 +3290,12 @@ def edit_tag(repo, tag, username=None, namespace=None): """ repo = flask.g.repo - tags = pagure.lib.query.get_tags_of_project(flask.g.session, repo) + tags = retrieval_queries.get_tags_of_project(flask.g.session, repo) if not tags: flask.abort(404, "Project has no tags to edit") # Check the tag exists, and get its old/original color - tagobj = pagure.lib.query.get_colored_tag(flask.g.session, tag, repo.id) + tagobj = retrieval_queries.get_colored_tag(flask.g.session, tag, repo.id) if not tagobj: flask.abort(404, "Tag %s not found in this project" % tag) @@ -3305,7 +3305,7 @@ def edit_tag(repo, tag, username=None, namespace=None): new_tag_description = form.tag_description.data new_tag_color = form.tag_color.data - msgs = pagure.lib.query.edit_issue_tags( + msgs = retrieval_queries.edit_issue_tags( flask.g.session, repo, tagobj, diff --git a/pagure/utils.py b/pagure/utils.py index 9e2b1dd..9b1be9a 100644 --- a/pagure/utils.py +++ b/pagure/utils.py @@ -122,7 +122,7 @@ def is_repo_admin(repo_obj, username=None): def is_repo_committer(repo_obj, username=None, session=None): """ Return whether the user is a committer of the provided repo. """ - import pagure.lib.query + from pagure.lib import retrieval_queries usergroups = set() if username is None: @@ -136,7 +136,7 @@ def is_repo_committer(repo_obj, username=None, session=None): if not session: session = flask.g.session try: - user = pagure.lib.query.get_user(session, username) + user = retrieval_queries.get_user(session, username) usergroups = usergroups.union(set(user.groups)) except pagure.exceptions.PagureException: return False diff --git a/tests/__init__.py b/tests/__init__.py index fe136c3..8d0b4bc 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -60,7 +60,7 @@ from pagure.api.ci import jenkins import pagure.flask_app import pagure.lib.git import pagure.lib.model -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks_mirror import pagure.perfrepo as perfrepo from pagure.config import config as pagure_config, reload_config @@ -367,9 +367,9 @@ class SimplePagureTest(unittest.TestCase): for folder in ['repos', 'forks', 'releases', 'remotes', 'attachments']: os.mkdir(os.path.join(self.path, folder)) - if hasattr(pagure.lib.query, 'REDIS') and pagure.lib.query.REDIS: - pagure.lib.query.REDIS.connection_pool.disconnect() - pagure.lib.query.REDIS = None + if hasattr(retrieval_queries, 'REDIS') and retrieval_queries.REDIS: + retrieval_queries.REDIS.connection_pool.disconnect() + retrieval_queries.REDIS = None # Database self._prepare_db() diff --git a/tests/test_pagure_admin.py b/tests/test_pagure_admin.py index c35a478..5f2b482 100644 --- a/tests/test_pagure_admin.py +++ b/tests/test_pagure_admin.py @@ -103,7 +103,7 @@ class PagureAdminAdminRefreshGitolitetests(tests.Modeltests): tests.create_projects(self.session) # Add a group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='foo', display_name='foo group', @@ -300,7 +300,7 @@ class PagureAdminAdminTokentests(tests.Modeltests): def test_do_list_admin_token_non_admin_acls(self): """ Test the do_list_admin_token function of pagure-admin for a token without any admin ACL. """ - pagure.lib.query.add_token_to_user( + retrieval_queries.add_token_to_user( self.session, project=None, acls=['issue_assign', 'pull_request_subscribe'], @@ -377,7 +377,7 @@ class PagureAdminAdminTokentests(tests.Modeltests): def test_do_info_admin_token_non_admin_acl(self): """ Test the do_info_admin_token function of pagure-admin for a token not having any admin ACL. """ - pagure.lib.query.add_token_to_user( + retrieval_queries.add_token_to_user( self.session, project=None, acls=['issue_assign', 'pull_request_subscribe'], @@ -1224,7 +1224,7 @@ class PagureNewGroupTests(tests.Modeltests): # Make the imported pagure use the correct db session pagure.cli.admin.session = self.session - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) def test_missing_display_name(self): @@ -1245,7 +1245,7 @@ class PagureNewGroupTests(tests.Modeltests): 'A display name must be provided for the group' ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) def test_missing_username(self): @@ -1268,7 +1268,7 @@ class PagureNewGroupTests(tests.Modeltests): 'An username must be provided to associate with the group' ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) def test_new_group(self): @@ -1285,7 +1285,7 @@ class PagureNewGroupTests(tests.Modeltests): pagure.cli.admin.do_new_group(args) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 1) @patch.dict('pagure.config.config', {'ENABLE_GROUP_MNGT': False}) @@ -1306,7 +1306,7 @@ class PagureNewGroupTests(tests.Modeltests): pagure.cli.admin.do_new_group(args) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) @patch.dict('pagure.config.config', {'ENABLE_GROUP_MNGT': False}) @@ -1327,7 +1327,7 @@ class PagureNewGroupTests(tests.Modeltests): pagure.cli.admin.do_new_group(args) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 1) @patch.dict('pagure.config.config', {'BLACKLISTED_GROUPS': ['foob']}) @@ -1351,7 +1351,7 @@ class PagureNewGroupTests(tests.Modeltests): 'This group name has been blacklisted, please choose another one' ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) @@ -1383,7 +1383,7 @@ class PagureListGroupEmptyTests(tests.Modeltests): # Make the imported pagure use the correct db session pagure.cli.admin.session = self.session - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) @patch('sys.stdout', new_callable=StringIO) @@ -1400,7 +1400,7 @@ class PagureListGroupEmptyTests(tests.Modeltests): 'No groups found in this pagure instance.\n' ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) @@ -1428,7 +1428,7 @@ class PagureListGroupTests(tests.Modeltests): self.session.add(item) # Create a group - pagure.lib.query.add_group( + retrieval_queries.add_group( self.session, group_name='JL', display_name='Justice League', @@ -1444,7 +1444,7 @@ class PagureListGroupTests(tests.Modeltests): # Make the imported pagure use the correct db session pagure.cli.admin.session = self.session - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 1) @patch('sys.stdout', new_callable=StringIO) @@ -1462,7 +1462,7 @@ class PagureListGroupTests(tests.Modeltests): 'Group: 1 - name JL\n' ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 1) @@ -1494,7 +1494,7 @@ class PagureBlockUserTests(tests.Modeltests): # Make the imported pagure use the correct db session pagure.cli.admin.session = self.session - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') self.assertIsNone(user.refuse_sessions_before) def test_missing_date(self): @@ -1513,7 +1513,7 @@ class PagureBlockUserTests(tests.Modeltests): 'Invalid date submitted: None, not of the format YYYY-MM-DD' ) - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') self.assertIsNone(user.refuse_sessions_before) def test_missing_username(self): @@ -1534,7 +1534,7 @@ class PagureBlockUserTests(tests.Modeltests): 'An username must be specified' ) - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') self.assertIsNone(user.refuse_sessions_before) def test_invalid_username(self): @@ -1555,7 +1555,7 @@ class PagureBlockUserTests(tests.Modeltests): 'No user "invalid" found' ) - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') self.assertIsNone(user.refuse_sessions_before) def test_invalide_date(self): @@ -1576,7 +1576,7 @@ class PagureBlockUserTests(tests.Modeltests): 'Invalid date submitted: 2018-14-05, not of the format YYYY-MM-DD' ) - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') self.assertIsNone(user.refuse_sessions_before) @patch('pagure.cli.admin._ask_confirmation', MagicMock(return_value=True)) @@ -1592,7 +1592,7 @@ class PagureBlockUserTests(tests.Modeltests): pagure.cli.admin.do_block_user(args) - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') self.assertIsNotNone(user.refuse_sessions_before) diff --git a/tests/test_pagure_exclude_group_index.py b/tests/test_pagure_exclude_group_index.py index fff1bac..8bbdb55 100644 --- a/tests/test_pagure_exclude_group_index.py +++ b/tests/test_pagure_exclude_group_index.py @@ -23,7 +23,7 @@ import mock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.model import tests @@ -38,7 +38,7 @@ class PagureExcludeGroupIndex(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Create a ``provenpackger`` group: - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='provenpackager', display_name='Proven Packagers', @@ -53,8 +53,8 @@ class PagureExcludeGroupIndex(tests.Modeltests): msg, 'User `pingou` added to the group `provenpackager`.') # Add the `provenpackager` group to the test2 project - project = pagure.lib.query._get_project(self.session, 'test2') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test2') + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='provenpackager', @@ -66,7 +66,7 @@ class PagureExcludeGroupIndex(tests.Modeltests): def test_defaults_pingou(self): """ Test which repo pingou has by default. """ - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( self.session, username='pingou', fork=False, @@ -79,7 +79,7 @@ class PagureExcludeGroupIndex(tests.Modeltests): def test_defaults_foo(self): """ Test which repo foo has by default. """ - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( self.session, username='foo', fork=False, @@ -91,12 +91,12 @@ class PagureExcludeGroupIndex(tests.Modeltests): def test_add_foo_test(self): """ Test adding foo to the test project. """ - group = pagure.lib.query.search_groups( + group = retrieval_queries.search_groups( self.session, group_name='provenpackager') self.assertEqual(group.group_name, 'provenpackager') # List all foo's project before (ie: there should be none) - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( self.session, username='foo', fork=False, @@ -105,7 +105,7 @@ class PagureExcludeGroupIndex(tests.Modeltests): self.assertEqual(len(repos), 0) # Adding `foo` to the `provenpackager` group - msg = pagure.lib.query.add_user_to_group( + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -116,7 +116,7 @@ class PagureExcludeGroupIndex(tests.Modeltests): msg, 'User `foo` added to the group `provenpackager`.') # Test that foo has now one project, via the provenpackager group - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( self.session, username='foo', fork=False, @@ -129,11 +129,11 @@ class PagureExcludeGroupIndex(tests.Modeltests): """ Test retrieving user's repo with a group excluded. """ # Add `foo` to `provenpackager` - group = pagure.lib.query.search_groups( + group = retrieval_queries.search_groups( self.session, group_name='provenpackager') self.assertEqual(group.group_name, 'provenpackager') - msg = pagure.lib.query.add_user_to_group( + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -144,7 +144,7 @@ class PagureExcludeGroupIndex(tests.Modeltests): msg, 'User `foo` added to the group `provenpackager`.') # Get foo's project outside of proven packager - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( self.session, username='foo', exclude_groups=['provenpackager'], @@ -154,13 +154,13 @@ class PagureExcludeGroupIndex(tests.Modeltests): self.assertEqual(len(repos), 0) # Get pingou's project outside of proven packager (nothing changes) - repos = pagure.lib.query.search_projects( + repos = retrieval_queries.search_projects( self.session, username='pingou', exclude_groups=['provenpackager'], fork=False, ) - repos2 = pagure.lib.query.search_projects( + repos2 = retrieval_queries.search_projects( self.session, username='pingou', fork=False, diff --git a/tests/test_pagure_flask.py b/tests/test_pagure_flask.py index b1a7089..bc64a89 100644 --- a/tests/test_pagure_flask.py +++ b/tests/test_pagure_flask.py @@ -26,7 +26,7 @@ import werkzeug sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.model import pagure.utils import tests @@ -57,7 +57,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): def test_is_repo_committer_logged_out(self): """ Test is_repo_committer in pagure when there is no logged in user. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') with self.app.application.app_context(): output = pagure.utils.is_repo_committer(repo) self.assertFalse(output) @@ -65,7 +65,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): def test_is_repo_committer_logged_in(self): """ Test is_repo_committer in pagure with the appropriate user logged in. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser(username='pingou') @@ -79,7 +79,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): """ Test is_repo_committer in pagure with the appropriate user logged in. """ # Create group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='packager', display_name='packager', @@ -92,8 +92,8 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): self.assertEqual(msg, 'User `pingou` added to the group `packager`.') # Add user to group - group = pagure.lib.query.search_groups(self.session, group_name='packager') - msg = pagure.lib.query.add_user_to_group( + group = retrieval_queries.search_groups(self.session, group_name='packager') + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -103,8 +103,8 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): self.assertEqual(msg, 'User `foo` added to the group `packager`.') # Add group packager to project test - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='packager', @@ -113,7 +113,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): self.session.commit() self.assertEqual(msg, 'Group added') - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser(username='foo') @@ -127,7 +127,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): """ Test is_repo_committer in pagure with the appropriate user logged in. """ # Create group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='packager', display_name='packager', @@ -140,8 +140,8 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): self.assertEqual(msg, 'User `pingou` added to the group `packager`.') # Add user to group - group = pagure.lib.query.search_groups(self.session, group_name='packager') - msg = pagure.lib.query.add_user_to_group( + group = retrieval_queries.search_groups(self.session, group_name='packager') + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -151,8 +151,8 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): self.assertEqual(msg, 'User `foo` added to the group `packager`.') # Add group packager to project test - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='packager', @@ -162,7 +162,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): self.session.commit() self.assertEqual(msg, 'Group added') - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser(username='foo') @@ -175,7 +175,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): def test_is_repo_committer_logged_in_wrong_user(self): """ Test is_repo_committer in pagure with the wrong user logged in. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser() @@ -196,7 +196,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): configured to give access to all the provenpackager, but the user is not one. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') user = tests.FakeUser() g = munch.Munch() @@ -213,7 +213,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): configured to give access to all the provenpackager, and the user is one """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser(username='foo') @@ -236,7 +236,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): configured to give access to all the provenpackager but for this one repo """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser() @@ -253,7 +253,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): configured to give access to all the provenpackager but for this one repo, but the user is still a direct committer """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser(username='pingou') @@ -275,7 +275,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): """ Test is_repo_committer in pagure with EXTERNAL_COMMITTER configured to give access the provenpackager just for one repo """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser() @@ -290,7 +290,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): """ Test is_repo_committer in pagure with EXTERNAL_COMMITTER configured to give access the provenpackager just for one repo """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') g = munch.Munch() g.fas_user = tests.FakeUser(username='foo') @@ -307,7 +307,7 @@ class PagureGetRemoteRepoPath(tests.SimplePagureTest): configured to give access the provenpackager just for one repo not this one """ - repo = pagure.lib.query._get_project(self.session, 'test2') + repo = retrieval_queries._get_project(self.session, 'test2') g = munch.Munch() g.fas_user = tests.FakeUser(username='foo') diff --git a/tests/test_pagure_flask_api.py b/tests/test_pagure_flask_api.py index 540fa83..eff02cc 100644 --- a/tests/test_pagure_flask_api.py +++ b/tests/test_pagure_flask_api.py @@ -26,7 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.api import pagure.flask_app -import pagure.lib.query +from pagure.lib import retrieval_queries import tests diff --git a/tests/test_pagure_flask_api_fork.py b/tests/test_pagure_flask_api_fork.py index 0964ce2..625a1bf 100644 --- a/tests/test_pagure_flask_api_fork.py +++ b/tests/test_pagure_flask_api_fork.py @@ -25,7 +25,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -50,10 +50,10 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project( self.session, 'test') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -66,7 +66,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -94,10 +94,10 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project( self.session, 'test') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -141,7 +141,7 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # Close the PR and try again - pagure.lib.query.close_pull_request( + retrieval_queries.close_pull_request( self.session, request=req, user='pingou', merged=False) @@ -173,10 +173,10 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project( self.session, 'test') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -208,7 +208,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(data['total_requests'], 1) # Close the PR and try again - pagure.lib.query.close_pull_request( + retrieval_queries.close_pull_request( self.session, request=req, user='pingou', merged=False) @@ -240,10 +240,10 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project( self.session, 'test') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -427,9 +427,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -442,7 +442,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -469,9 +469,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -641,9 +641,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -801,9 +801,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -816,7 +816,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -847,9 +847,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -908,7 +908,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.session.commit() # Allow the token to close PR - acls = pagure.lib.query.get_acls(self.session) + acls = retrieval_queries.get_acls(self.session) for acl in acls: if acl.name == 'pull_request_close': break @@ -964,9 +964,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='test', @@ -979,7 +979,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1017,9 +1017,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='test', @@ -1032,7 +1032,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['Only_assignee_can_merge_pull-request'] = True repo.settings = settings @@ -1072,9 +1072,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='test', @@ -1086,11 +1086,11 @@ class PagureFlaskApiForktests(tests.Modeltests): self.session.commit() self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - req.assignee = pagure.lib.query.search_user(self.session, 'foo') + req.assignee = retrieval_queries.search_user(self.session, 'foo') self.session.add(req) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['Only_assignee_can_merge_pull-request'] = True repo.settings = settings @@ -1128,9 +1128,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='test', @@ -1143,7 +1143,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['Minimum_score_to_merge_pull-request'] = 2 repo.settings = settings @@ -1181,9 +1181,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='test', @@ -1242,7 +1242,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.session.commit() # Allow the token to merge PR - acls = pagure.lib.query.get_acls(self.session) + acls = retrieval_queries.get_acls(self.session) for acl in acls: if acl.name == 'pull_request_merge': break @@ -1297,9 +1297,9 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='test', @@ -1359,7 +1359,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.session.commit() # Allow the token to merge PR - acls = pagure.lib.query.get_acls(self.session) + acls = retrieval_queries.get_acls(self.session) acl = None for acl in acls: if acl.name == 'pull_request_merge': @@ -1446,9 +1446,9 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1463,7 +1463,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Check comments before self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -1487,7 +1487,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # No change self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -1507,7 +1507,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # One comment added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 1) @@ -1523,9 +1523,9 @@ class PagureFlaskApiForktests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1543,7 +1543,7 @@ class PagureFlaskApiForktests(tests.Modeltests): } # Valid request - with patch('pagure.lib.query.add_pull_request_comment', + with patch('retrieval_queries.add_pull_request_comment', side_effect=pagure.exceptions.PagureException('error')): output = self.app.post( '/api/0/test/pull-request/1/comment', data=data, headers=headers) @@ -1566,9 +1566,9 @@ class PagureFlaskApiForktests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1581,7 +1581,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.id, 1) self.assertEqual(req.title, 'test pull-request') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1607,7 +1607,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # no comment added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -1662,9 +1662,9 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1679,7 +1679,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Check comments before self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -1703,7 +1703,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # No change self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -1723,7 +1723,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # One comment added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 1) @@ -1736,7 +1736,7 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1786,8 +1786,8 @@ class PagureFlaskApiForktests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -1801,11 +1801,11 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.title, 'test pull-request') # Check subscribtion before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, request), + retrieval_queries.get_watch_list(self.session, request), set(['pingou'])) data = {} @@ -1887,8 +1887,8 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # Create pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -1902,11 +1902,11 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.title, 'test pull-request') # Check subscribtion before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, request), + retrieval_queries.get_watch_list(self.session, request), set(['pingou'])) # Unsubscribe - no changes @@ -1941,11 +1941,11 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, request), + retrieval_queries.get_watch_list(self.session, request), set(['pingou'])) # Subscribe @@ -1980,11 +1980,11 @@ class PagureFlaskApiForktests(tests.Modeltests): } ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, request), + retrieval_queries.get_watch_list(self.session, request), set(['pingou', 'bar'])) # Unsubscribe @@ -2003,11 +2003,11 @@ class PagureFlaskApiForktests(tests.Modeltests): } ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, request), + retrieval_queries.get_watch_list(self.session, request), set(['pingou'])) @patch('pagure.lib.git.update_git') @@ -2037,8 +2037,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -2052,11 +2052,11 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertEqual(req.title, 'test pull-request') # Check subscribtion before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, request), + retrieval_queries.get_watch_list(self.session, request), set(['pingou'])) # Subscribe @@ -2077,11 +2077,11 @@ class PagureFlaskApiForktests(tests.Modeltests): ) # Check subscribtions after - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, request), + retrieval_queries.get_watch_list(self.session, request), set(['pingou', 'foo'])) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) @@ -2241,7 +2241,7 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Check the behavior if the project disabled the issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -2285,7 +2285,7 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Check the behavior if the project disabled the issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['Enforce_signed-off_commits_in_pull-request'] = True repo.settings = settings @@ -2330,7 +2330,7 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Check the behavior if the project disabled the issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['Enforce_signed-off_commits_in_pull-request'] = True repo.settings = settings @@ -2450,7 +2450,7 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Check the behavior if the project disabled the issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['Enforce_signed-off_commits_in_pull-request'] = True repo.settings = settings @@ -2725,8 +2725,8 @@ class PagureFlaskApiForkPRDiffStatstests(tests.Modeltests): os.path.join(self.path, 'repos', 'test.git'), branch='test') # Create the pull-request to close - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='test', @@ -2792,7 +2792,7 @@ class PagureFlaskApiForkPRDiffStatstests(tests.Modeltests): os.path.join(self.path, 'repos', 'test.git'), readme_name='README.md', branch='test') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.requests), 1) output = self.app.get('/api/0/test/pull-request/1/diffstats') @@ -2836,7 +2836,7 @@ class PagureFlaskApiForkPRDiffStatstests(tests.Modeltests): @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_api_pull_request_diffstats_file_modified_deleted(self): """ Test the api_pull_request_merge method of the flask api. """ - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.requests), 1) pagure.lib.tasks.update_pull_request(repo.requests[0].uid) @@ -2847,7 +2847,7 @@ class PagureFlaskApiForkPRDiffStatstests(tests.Modeltests): os.path.join(self.path, 'repos', 'test.git'), filename='sources', branch='test') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.requests), 1) pagure.lib.tasks.update_pull_request(repo.requests[0].uid) diff --git a/tests/test_pagure_flask_api_group.py b/tests/test_pagure_flask_api_group.py index f06022a..8a63e38 100644 --- a/tests/test_pagure_flask_api_group.py +++ b/tests/test_pagure_flask_api_group.py @@ -21,7 +21,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.api -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -36,7 +36,7 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): pagure.config.config['REQUESTS_FOLDER'] = None - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='some_group', display_name='Some Group', @@ -50,8 +50,8 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test2') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test2') + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='some_group', @@ -223,8 +223,8 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): ) self.session.add(user) self.session.commit() - group = pagure.lib.query.search_groups(self.session, group_name='some_group') - result = pagure.lib.query.add_user_to_group( + group = retrieval_queries.search_groups(self.session, group_name='some_group') + result = retrieval_queries.add_user_to_group( self.session, user.username, group, user.username, True) self.assertEqual( result, 'User `mprahl` added to the group `some_group`.') @@ -508,8 +508,8 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): """ # Make the group having only commit access - project = pagure.lib.query._get_project(self.session, 'test2') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test2') + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='some_group', @@ -546,8 +546,8 @@ class PagureFlaskApiGroupTests(tests.SimplePagureTest): """ # Make the group having only ticket access - project = pagure.lib.query._get_project(self.session, 'test2') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test2') + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='some_group', diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index a5cca6f..779b26e 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -31,7 +31,7 @@ from sqlalchemy.exc import SQLAlchemyError sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests FULL_ISSUE_LIST = [ @@ -515,7 +515,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): headers = {'Authorization': 'token aaabbbcccddd'} # Set some milestones - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'milestone-1.0': '', 'milestone-2.0': 'Tomorrow!'} self.session.add(repo) self.session.commit() @@ -897,7 +897,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): headers = {'Authorization': 'token aaabbbcccddd'} # Set some milestones - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'milestone-1.0': '', 'milestone-2.0': 'Tomorrow!'} self.session.add(repo) self.session.commit() @@ -1176,8 +1176,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1625,12 +1625,12 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create 2 tickets but only 1 has a milestone start = arrow.utcnow().timestamp issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #1', content='Description', @@ -1642,7 +1642,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.session.commit() issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #2', content='Description', @@ -1744,12 +1744,12 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create 2 tickets but only 1 has a priority start = arrow.utcnow().timestamp issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #1', content='Description', @@ -1761,7 +1761,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.session.commit() issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #2', content='Description', @@ -1928,12 +1928,12 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create 2 tickets but only 1 has a milestone start = arrow.utcnow().timestamp issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #1', content='Description', @@ -1945,7 +1945,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.session.commit() issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #2', content='Description', @@ -2085,12 +2085,12 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create 1st tickets start = arrow.utcnow().timestamp issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #1', content='Description', @@ -2106,7 +2106,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): # Create 2nd tickets issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #2', content='Description', @@ -2122,7 +2122,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): # Create private issue issue = pagure.lib.model.Issue( - id=pagure.lib.query.get_next_id(self.session, repo.id), + id=retrieval_queries.get_next_id(self.session, repo.id), project_id=repo.id, title='Issue #3', content='Description', @@ -2427,8 +2427,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2565,7 +2565,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() @@ -2592,7 +2592,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() @@ -2617,7 +2617,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() @@ -2644,15 +2644,15 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -2664,8 +2664,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check milestone before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) data = { @@ -2683,8 +2683,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) def test_api_change_milestone_issue_invalid_milestone(self): @@ -2695,15 +2695,15 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -2715,8 +2715,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check milestone before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) data = { @@ -2749,15 +2749,15 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -2769,8 +2769,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check milestone before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) data = { @@ -2799,15 +2799,15 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -2819,8 +2819,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check milestone before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) data = { @@ -2861,8 +2861,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Change recorded - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) def test_api_change_milestone_issue_remove_milestone2(self): @@ -2873,15 +2873,15 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -2893,8 +2893,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check milestone before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) data = { @@ -2933,8 +2933,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Change recorded - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.milestone, None) def test_api_change_milestone_issue_unauthorized(self): @@ -2945,15 +2945,15 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -2980,7 +2980,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) @patch( - 'pagure.lib.query.add_metadata_update_notif', + 'retrieval_queries.add_metadata_update_notif', MagicMock(side_effect=pagure.exceptions.PagureException('error'))) def test_api_change_milestone_issue_raises_exception(self): """ Test the api_change_milestone_issue method of the flask api. """ @@ -2990,15 +2990,15 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3036,8 +3036,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Create normal issue in test - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3070,8 +3070,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # One comment added - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) # View a comment that does not exist @@ -3149,8 +3149,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): tests.create_tokens_acl(self.session) # Create normal issue in test - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3281,8 +3281,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3295,13 +3295,13 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check comments before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') data = { @@ -3328,8 +3328,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): {'message': 'Assignee reset'} ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.assignee, None) # Un-assign @@ -3342,8 +3342,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): data, {'message': 'Nothing to change'} ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.assignee, None) # Re-assign for the rest of the tests @@ -3381,8 +3381,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): # One comment added self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.assignee.user, 'pingou') # Create another project @@ -3415,9 +3415,9 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.session.add(item) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'foo') + repo = retrieval_queries.get_authorized_project(self.session, 'foo') # Create private issue - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3430,8 +3430,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue') # Check before - repo = pagure.lib.query.get_authorized_project(self.session, 'foo') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'foo') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) data = { @@ -3451,8 +3451,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): pagure.api.APIERROR.EINVALIDTOK.name, data['error_code']) # No comment added - repo = pagure.lib.query.get_authorized_project(self.session, 'foo') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'foo') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) # Create token for user foo @@ -3495,8 +3495,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3510,8 +3510,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check comments before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) # Un-assign @@ -3606,8 +3606,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3620,10 +3620,10 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Check subscribtion before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, issue), + retrieval_queries.get_watch_list(self.session, issue), set(['pingou', 'foo'])) @@ -3655,10 +3655,10 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, issue), + retrieval_queries.get_watch_list(self.session, issue), set(['pingou', 'foo'])) # Subscribe @@ -3689,10 +3689,10 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): 'user': 'bar'} ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, issue), + retrieval_queries.get_watch_list(self.session, issue), set(['pingou', 'foo', 'bar'])) # Unsubscribe @@ -3709,10 +3709,10 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): 'user': 'bar'} ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( - pagure.lib.query.get_watch_list(self.session, issue), + retrieval_queries.get_watch_list(self.session, issue), set(['pingou', 'foo'])) def test_api_update_custom_field(self): @@ -3762,8 +3762,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3788,7 +3788,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) # Check the behavior if the project disabled the issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['issue_tracker'] = False repo.settings = settings @@ -3807,7 +3807,7 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): } ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['issue_tracker'] = True repo.settings = settings @@ -3830,8 +3830,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): headers = {'Authorization': 'token aaabbbcccddd'} # Set some custom fields - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.set_custom_key_fields( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.set_custom_key_fields( self.session, repo, ['bugzilla', 'upstream', 'reviewstatus'], ['link', 'boolean', 'list'], @@ -3864,8 +3864,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): } ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.other_fields, []) self.assertEqual(len(issue.other_fields), 0) @@ -3884,8 +3884,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): } ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.other_fields, []) self.assertEqual(len(issue.other_fields), 0) @@ -3904,8 +3904,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.other_fields), 1) self.assertEqual(issue.other_fields[0].key.name, 'bugzilla') self.assertEqual( @@ -3927,12 +3927,12 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.other_fields), 0) @patch( - 'pagure.lib.query.set_custom_key_value', + 'retrieval_queries.set_custom_key_value', MagicMock(side_effect=pagure.exceptions.PagureException('error'))) def test_api_update_custom_field_raises_error(self): """ Test the api_update_custom_field method of the flask api. """ @@ -3944,8 +3944,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): headers = {'Authorization': 'token aaabbbcccddd'} # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3957,8 +3957,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.assertEqual(msg.title, 'Test issue #1') # Set some custom fields - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.set_custom_key_fields( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.set_custom_key_fields( self.session, repo, ['bugzilla', 'upstream', 'reviewstatus'], ['link', 'boolean', 'list'], @@ -3994,8 +3994,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.test_api_new_issue() # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -4024,8 +4024,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.test_api_new_issue() # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -4142,8 +4142,8 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest): self.test_api_new_issue() # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', diff --git a/tests/test_pagure_flask_api_issue_change_status.py b/tests/test_pagure_flask_api_issue_change_status.py index 3840051..861067d 100644 --- a/tests/test_pagure_flask_api_issue_change_status.py +++ b/tests/test_pagure_flask_api_issue_change_status.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.model import tests @@ -50,8 +50,8 @@ class PagureFlaskApiIssueChangeStatustests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -63,7 +63,7 @@ class PagureFlaskApiIssueChangeStatustests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Create private issue - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -152,8 +152,8 @@ class PagureFlaskApiIssueChangeStatustests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Check status before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') data = { @@ -175,8 +175,8 @@ class PagureFlaskApiIssueChangeStatustests(tests.Modeltests): ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') def test_api_change_status_issue_no_change(self): @@ -199,17 +199,17 @@ class PagureFlaskApiIssueChangeStatustests(tests.Modeltests): ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) @patch( - 'pagure.lib.query.edit_issue', + 'retrieval_queries.edit_issue', MagicMock(side_effect=pagure.exceptions.PagureException('error'))) def test_api_change_status_issue_raise_error(self): """ Test the api_change_status_issue method of the flask api. """ - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') close_status = repo.close_status close_status = ['Fixed', 'Upstream', 'Invalid'] repo.close_status = close_status @@ -273,7 +273,7 @@ class PagureFlaskApiIssueChangeStatustests(tests.Modeltests): @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_api_change_status_issue_closed_status(self): """ Test the api_change_status_issue method of the flask api. """ - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') close_status = repo.close_status close_status = ['Fixed', 'Upstream', 'Invalid'] repo.close_status = close_status diff --git a/tests/test_pagure_flask_api_issue_comment.py b/tests/test_pagure_flask_api_issue_comment.py index 2ccf301..09d6593 100644 --- a/tests/test_pagure_flask_api_issue_comment.py +++ b/tests/test_pagure_flask_api_issue_comment.py @@ -22,7 +22,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query # noqa: E402 +from pagure.lib import retrieval_queries # noqa: E402 import tests # noqa: E402 @@ -44,8 +44,8 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -57,7 +57,7 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Create private issue - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -131,8 +131,8 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Check comments before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) data = { @@ -154,8 +154,8 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') def test_api_comment_issue(self): @@ -181,16 +181,16 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): ) # One comment added - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) def test_api_comment_issue_private_un_authorized(self): """ Test the api_comment_issue method of the flask api. """ # Check before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 0) data = { @@ -208,8 +208,8 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error']) # No comment added - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 0) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) @@ -300,8 +300,8 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): headers = {'Authorization': 'token project-less-foo'} # Check comments before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) data = { @@ -323,8 +323,8 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): ) # No change - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) @@ -351,16 +351,16 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): ) # One comment added - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) def test_api_comment_issue_private_un_authorized_project_less(self): """ Test the api_comment_issue method of the flask api. """ # Check before - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 0) data = { @@ -378,8 +378,8 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests): self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error']) # No comment added - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 0) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) diff --git a/tests/test_pagure_flask_api_issue_create.py b/tests/test_pagure_flask_api_issue_create.py index b7722eb..831ecbc 100644 --- a/tests/test_pagure_flask_api_issue_create.py +++ b/tests/test_pagure_flask_api_issue_create.py @@ -21,7 +21,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query # noqa: E402 +from pagure.lib import retrieval_queries # noqa: E402 import tests # noqa: E402 diff --git a/tests/test_pagure_flask_api_issue_custom_fields.py b/tests/test_pagure_flask_api_issue_custom_fields.py index ab876be..fdc51d4 100644 --- a/tests/test_pagure_flask_api_issue_custom_fields.py +++ b/tests/test_pagure_flask_api_issue_custom_fields.py @@ -18,7 +18,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query # noqa: E402 +from pagure.lib import retrieval_queries # noqa: E402 import tests # noqa: E402 @@ -38,8 +38,8 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -91,7 +91,7 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests): ) @patch( - 'pagure.lib.query.set_custom_key_value', + 'retrieval_queries.set_custom_key_value', MagicMock(side_effect=pagure.exceptions.PagureException('error'))) def test_api_update_custom_field_raise_error(self): """ Test the api_update_custom_field method of the flask api. @@ -101,8 +101,8 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Set some custom fields - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.set_custom_key_fields( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.set_custom_key_fields( self.session, repo, ['bugzilla', 'upstream', 'reviewstatus'], ['link', 'boolean', 'list'], @@ -127,8 +127,8 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Set some custom fields - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.set_custom_key_fields( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.set_custom_key_fields( self.session, repo, ['bugzilla', 'upstream', 'reviewstatus'], ['link', 'boolean', 'list'], @@ -154,8 +154,8 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.other_fields), 1) payload = {'bugzilla': 'https://bugzilla.redhat.com/1234', @@ -181,8 +181,8 @@ class PagureFlaskApiCustomFieldIssuetests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.other_fields), 3) # Reset the value diff --git a/tests/test_pagure_flask_api_pr_flag.py b/tests/test_pagure_flask_api_pr_flag.py index 6122bab..ab13d43 100644 --- a/tests/test_pagure_flask_api_pr_flag.py +++ b/tests/test_pagure_flask_api_pr_flag.py @@ -21,7 +21,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.config # noqa -import pagure.lib.query # noqa +from pagure.lib import retrieval_queries # noqa import tests # noqa @@ -42,9 +42,9 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -59,7 +59,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): # Check flags before self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 0) @@ -97,7 +97,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): def test_pr_disabled(self): """ Test the flagging a PR when PRs are disabled. """ - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -185,12 +185,12 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): # No change self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 0) @patch( - 'pagure.lib.query.add_pull_request_flag', + 'retrieval_queries.add_pull_request_flag', MagicMock(side_effect=pagure.exceptions.PagureException('error'))) def test_raise_exception(self): """ Test the flagging a PR when adding a flag raises an exception. """ @@ -217,7 +217,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Enable PR notifications - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['notify_on_pull-request_flag'] = True repo.settings = settings @@ -266,7 +266,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests running') @@ -332,7 +332,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests running') @@ -380,7 +380,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests passed') @@ -433,7 +433,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests passed') @@ -482,7 +482,7 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests): # Two flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 2) self.assertEqual(request.flags[0].comment, 'Tests running again') @@ -580,9 +580,9 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -597,7 +597,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests): # Check flags before self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 0) @@ -684,7 +684,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests): # No change self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 0) @@ -717,7 +717,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests): # No change self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 0) @@ -771,7 +771,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests failed') @@ -827,7 +827,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests failed') @@ -876,7 +876,7 @@ class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests): # Still only one flag self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests passed') diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py index 4b7ea28..0463bcb 100644 --- a/tests/test_pagure_flask_api_project.py +++ b/tests/test_pagure_flask_api_project.py @@ -30,7 +30,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.flask_app -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -217,7 +217,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): tests.create_tokens_acl(self.session, 'aaabbbcccddd') headers = {'Authorization': 'token aaabbbcccddd'} - test_project = pagure.lib.query._get_project(self.session, 'test') + test_project = retrieval_queries._get_project(self.session, 'test') test_project.private = True self.session.add(test_project) self.session.commit() @@ -240,7 +240,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): project is private and the user is not logged in. """ tests.create_projects(self.session) - test_project = pagure.lib.query._get_project(self.session, 'test') + test_project = retrieval_queries._get_project(self.session, 'test') test_project.private = True self.session.add(test_project) self.session.commit() @@ -370,16 +370,16 @@ class PagureFlaskApiProjecttests(tests.Modeltests): tests.create_projects(self.session) # Check before adding - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.tags, []) # Adding a tag - output = pagure.lib.query.update_tags( + output = retrieval_queries.update_tags( self.session, repo, 'infra', 'pingou') self.assertEqual(output, ['Project tagged with: infra']) # Check after adding - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) @@ -851,16 +851,16 @@ class PagureFlaskApiProjecttests(tests.Modeltests): tests.create_projects(self.session) # Check before adding - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.tags, []) # Adding a tag - output = pagure.lib.query.update_tags( + output = retrieval_queries.update_tags( self.session, repo, 'infra', 'pingou') self.assertEqual(output, ['Project tagged with: infra']) # Check after adding - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) @@ -921,20 +921,20 @@ class PagureFlaskApiProjecttests(tests.Modeltests): def test_api_project_group(self): """ Test the api_project method of the flask api. """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Adding a tag - output = pagure.lib.query.update_tags( + output = retrieval_queries.update_tags( self.session, repo, 'infra', 'pingou') self.assertEqual(output, ['Project tagged with: infra']) # Check after adding - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) # Add a group to the project - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='some_group', display_name='Some Group', @@ -946,11 +946,11 @@ class PagureFlaskApiProjecttests(tests.Modeltests): ) self.session.commit() - project = pagure.lib.query.get_authorized_project(self.session, 'test') - group = pagure.lib.query.search_groups( + project = retrieval_queries.get_authorized_project(self.session, 'test') + group = retrieval_queries.search_groups( self.session, group_name='some_group') - pagure.lib.query.add_group_to_project( + retrieval_queries.add_group_to_project( self.session, project, new_group='some_group', @@ -1016,15 +1016,15 @@ class PagureFlaskApiProjecttests(tests.Modeltests): group details while there are none associated. """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Adding a tag - output = pagure.lib.query.update_tags( + output = retrieval_queries.update_tags( self.session, repo, 'infra', 'pingou') self.assertEqual(output, ['Project tagged with: infra']) # Check after adding - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) @@ -1525,8 +1525,8 @@ class PagureFlaskApiProjecttests(tests.Modeltests): tests.create_tokens_acl(self.session, 'aaabbbcccddd', 'modify_project') headers = {'Authorization': 'token aaabbbcccddd'} - project = pagure.lib.query._get_project(self.session, 'test') - pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + retrieval_queries.add_user_to_project( self.session, project, new_user='foo', user='pingou', @@ -1714,7 +1714,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): the main_admin. """ tests.create_projects(self.session) - project_user = pagure.lib.query.model.ProjectUser( + project_user = retrieval_queries.model.ProjectUser( project_id=1, user_id=2, access='admin', @@ -1858,10 +1858,10 @@ class PagureFlaskApiProjecttests(tests.Modeltests): } self.assertDictEqual(json.loads(output.get_data(as_text=True)), expected_data) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') # The owner is watching issues and commits explicitly - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'pingou', '3') self.session.commit() output = self.app.get('/api/0/test/watchers') @@ -1878,7 +1878,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertDictEqual(json.loads(output.get_data(as_text=True)), expected_data) # The owner is watching issues explicitly - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'pingou', '1') self.session.commit() output = self.app.get('/api/0/test/watchers') @@ -1894,7 +1894,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertDictEqual(json.loads(output.get_data(as_text=True)), expected_data) # The owner is watching commits explicitly - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'pingou', '2') self.session.commit() output = self.app.get('/api/0/test/watchers') @@ -1916,7 +1916,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): user_id=2, access='commit', ) - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'pingou', '2') self.session.add(project_user) self.session.commit() @@ -1933,7 +1933,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertDictEqual(json.loads(output.get_data(as_text=True)), expected_data) # The owner and foo are watching issues implicitly - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'pingou', '-1') self.session.commit() @@ -1950,7 +1950,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): # The owner and foo through group membership are watching issues # implicitly - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'pingou', '-1') project_membership = self.session.query( pagure.lib.model.ProjectUser).filter_by( @@ -1958,7 +1958,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.session.delete(project_membership) self.session.commit() - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='some_group', display_name='Some Group', @@ -1970,13 +1970,13 @@ class PagureFlaskApiProjecttests(tests.Modeltests): ) self.session.commit() - project = pagure.lib.query.get_authorized_project(self.session, 'test') - group = pagure.lib.query.search_groups( + project = retrieval_queries.get_authorized_project(self.session, 'test') + group = retrieval_queries.search_groups( self.session, group_name='some_group') - pagure.lib.query.add_user_to_group( + retrieval_queries.add_user_to_group( self.session, 'foo', group, 'pingou', False) - pagure.lib.query.add_group_to_project( + retrieval_queries.add_group_to_project( self.session, project, new_group='some_group', @@ -2000,9 +2000,9 @@ class PagureFlaskApiProjecttests(tests.Modeltests): # The owner is watching issues implicitly and foo will be watching # commits explicitly but is in a group with commit access - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'pingou', '-1') - pagure.lib.query.update_watch_status( + retrieval_queries.update_watch_status( self.session, project, 'foo', '2') self.session.commit() @@ -2112,7 +2112,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): def test_adopt_repos(self): """ Test the new_project endpoint with existing git repo. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) @@ -2616,7 +2616,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.session, 'aaabbbcccddd', 'generate_acls_project') headers = {'Authorization': 'token aaabbbcccddd'} - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') output = self.app.post( '/api/0/test/git/generateacls', headers=headers, data={'wait': False}) @@ -2639,7 +2639,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd', 'Content-Type': 'application/json'} - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') output = self.app.post( '/api/0/test/git/generateacls', headers=headers, @@ -2667,7 +2667,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): task_result.id = 'abc-1234' self.mock_gen_acls.return_value = task_result - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') output = self.app.post( '/api/0/test/git/generateacls', headers=headers, data={'wait': True}) @@ -2690,7 +2690,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.session, 'aaabbbcccddd', 'generate_acls_project') headers = {'Authorization': 'token aaabbbcccddd'} - user = pagure.lib.query.get_user(self.session, 'pingou') + user = retrieval_queries.get_user(self.session, 'pingou') output = self.app.post( '/api/0/test12345123/git/generateacls', headers=headers, data={'wait': False}) @@ -3101,7 +3101,7 @@ class PagureFlaskApiProjectFlagtests(tests.Modeltests): """ Test flagging a commit with notification enabled. """ # Enable commit notifications - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['notify_on_commit_flag'] = True repo.settings = settings @@ -3215,7 +3215,7 @@ class PagureFlaskApiProjectFlagtests(tests.Modeltests): def test_commit_flags(self): """ Test retrieving commit flags. """ - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo_obj = pygit2.Repository(self.git_path) commit = repo_obj.revparse_single('HEAD') @@ -3225,7 +3225,7 @@ class PagureFlaskApiProjectFlagtests(tests.Modeltests): self.assertEqual(output.status_code, 200) # add some flags and retrieve them - pagure.lib.query.add_commit_flag( + retrieval_queries.add_commit_flag( session=self.session, repo=repo, commit_hash=commit.oid.hex, @@ -3239,7 +3239,7 @@ class PagureFlaskApiProjectFlagtests(tests.Modeltests): token='aaabbbcccddd' ) - pagure.lib.query.add_commit_flag( + retrieval_queries.add_commit_flag( session=self.session, repo=repo, commit_hash=commit.oid.hex, @@ -3309,7 +3309,7 @@ class PagureFlaskApiProjectModifyAclTests(tests.Modeltests): tests.create_tokens_acl( self.session, 'aaabbbcccddd', 'modify_project') - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertEquals( project.access_users, {u'admin': [], u'commit': [], u'ticket': []} @@ -3505,7 +3505,7 @@ class PagureFlaskApiProjectModifyAclTests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='baz', display_name='baz group', @@ -3572,7 +3572,7 @@ class PagureFlaskApiProjectModifyAclTests(tests.Modeltests): are specified. """ headers = {'Authorization': 'token aaabbbcccddd'} - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertEquals( project.access_users, {u'admin': [], u'commit': [], u'ticket': []} @@ -3624,8 +3624,8 @@ class PagureFlaskApiProjectModifyAclTests(tests.Modeltests): self.test_api_modify_acls_user() # Ensure `foo` was properly added: - project = pagure.lib.query._get_project(self.session, 'test') - user_foo = pagure.lib.query.search_user(self.session, username='foo') + project = retrieval_queries._get_project(self.session, 'test') + user_foo = retrieval_queries.search_user(self.session, username='foo') self.assertEquals( project.access_users, {u'admin': [], u'commit': [user_foo], u'ticket': []} @@ -3698,8 +3698,8 @@ class PagureFlaskApiProjectModifyAclTests(tests.Modeltests): self.assertEqual(data, expected_output) # Ensure `foo` was properly removed - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query._get_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries._get_project(self.session, 'test') self.assertEquals( project.access_users, {u'admin': [], u'commit': [], u'ticket': []} @@ -3712,8 +3712,8 @@ class PagureFlaskApiProjectModifyAclTests(tests.Modeltests): self.test_api_modify_acls_user() # Ensure `foo` was properly added: - project = pagure.lib.query._get_project(self.session, 'test') - user_foo = pagure.lib.query.search_user(self.session, username='foo') + project = retrieval_queries._get_project(self.session, 'test') + user_foo = retrieval_queries.search_user(self.session, username='foo') self.assertEquals( project.access_users, {u'admin': [], u'commit': [user_foo], u'ticket': []} @@ -3773,8 +3773,8 @@ class PagureFlaskApiProjectModifyAclTests(tests.Modeltests): self.assertEqual(data, expected_output) # Ensure `foo` was properly removed - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query._get_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries._get_project(self.session, 'test') self.assertEquals( project.access_users, {u'admin': [], u'commit': [], u'ticket': []} diff --git a/tests/test_pagure_flask_api_project_update_watch.py b/tests/test_pagure_flask_api_project_update_watch.py index 3ac3495..9e9559e 100644 --- a/tests/test_pagure_flask_api_project_update_watch.py +++ b/tests/test_pagure_flask_api_project_update_watch.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -47,8 +47,8 @@ class PagureFlaskApiProjectUpdateWatchTests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create normal issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py index 0e4123e..0a1f700 100644 --- a/tests/test_pagure_flask_api_ui_private_repo.py +++ b/tests/test_pagure_flask_api_ui_private_repo.py @@ -19,7 +19,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -357,8 +357,8 @@ class PagurePrivateRepotest(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.query._get_project(self.session, 'pmc') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries._get_project(self.session, 'pmc') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from=branch_from, @@ -610,9 +610,9 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual( output_text.count('Groups'), 0) - repo = pagure.lib.query._get_project(self.session, 'test3') + repo = retrieval_queries._get_project(self.session, 'test3') - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='pingou', @@ -721,7 +721,7 @@ class PagurePrivateRepotest(tests.Modeltests): output.get_data(as_text=True)) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test4') + repo = retrieval_queries._get_project(self.session, 'test4') self.assertTrue(repo.private) # Make the project public @@ -741,7 +741,7 @@ class PagurePrivateRepotest(tests.Modeltests): output.get_data(as_text=True)) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test4') + repo = retrieval_queries._get_project(self.session, 'test4') self.assertFalse(repo.private) @patch('pagure.decorators.admin_session_timedout') @@ -776,7 +776,7 @@ class PagurePrivateRepotest(tests.Modeltests): output.get_data(as_text=True)) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test4') + repo = retrieval_queries._get_project(self.session, 'test4') self.assertFalse(repo.private) # Make the project private @@ -797,7 +797,7 @@ class PagurePrivateRepotest(tests.Modeltests): # No change since we can't do public -> private self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test4') + repo = retrieval_queries._get_project(self.session, 'test4') self.assertFalse(repo.private) @patch('pagure.lib.notify.send_email') @@ -817,9 +817,9 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'pmc') + repo = retrieval_queries._get_project(self.session, 'pmc') - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -879,7 +879,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.query._get_project(self.session, 'pmc') + project = retrieval_queries._get_project(self.session, 'pmc') self.assertEqual(len(project.requests), 1) output = self.app.get('/pmc/pull-request/1') @@ -932,8 +932,8 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query._get_project(self.session, 'test4') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries._get_project(self.session, 'test4') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -976,9 +976,9 @@ class PagurePrivateRepotest(tests.Modeltests): output = self.app.get('/test4/issue/1') self.assertEqual(output.status_code, 200) - repo = pagure.lib.query._get_project(self.session, 'test4') + repo = retrieval_queries._get_project(self.session, 'test4') - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -1018,7 +1018,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.query._get_project(self.session, "test4") + repo = retrieval_queries._get_project(self.session, "test4") # Add a git repo repo_path = os.path.join( pagure.config.config.get('GIT_FOLDER'), 'test4.git') @@ -1039,7 +1039,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(output.status_code, 404) # Add commit access to a user - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( self.session, project=repo, new_user="foo", @@ -1049,7 +1049,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.commit() - repo = pagure.lib.query._get_project(self.session, "test4") + repo = retrieval_queries._get_project(self.session, "test4") self.assertEqual(len(repo.users), 1) # Check if the user can access private repo @@ -1082,7 +1082,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(output.status_code, 404) # Adding a ticket level access to bar - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( self.session, project=repo, new_user="bar", @@ -1091,7 +1091,7 @@ class PagurePrivateRepotest(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query._get_project(self.session, "test4") + repo = retrieval_queries._get_project(self.session, "test4") self.assertEqual(len(repo.users), 2) # Check if the ticket level access user can access the project @@ -1197,16 +1197,16 @@ class PagurePrivateRepotest(tests.Modeltests): shutil.rmtree(newpath) # Check before adding - repo = pagure.lib.query._get_project(self.session, 'test4') + repo = retrieval_queries._get_project(self.session, 'test4') self.assertEqual(repo.tags, []) # Adding a tag - output = pagure.lib.query.update_tags( + output = retrieval_queries.update_tags( self.session, repo, 'infra', 'pingou') self.assertEqual(output, ['Project tagged with: infra']) # Check after adding - repo = pagure.lib.query._get_project(self.session, 'test4') + repo = retrieval_queries._get_project(self.session, 'test4') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) @@ -1452,9 +1452,9 @@ class PagurePrivateRepotest(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.query._get_project(self.session, 'test4') - forked_repo = pagure.lib.query._get_project(self.session, 'test4') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test4') + forked_repo = retrieval_queries._get_project(self.session, 'test4') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1771,9 +1771,9 @@ class PagurePrivateRepotest(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.query._get_project(self.session, 'test4') - forked_repo = pagure.lib.query._get_project(self.session, 'test4') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test4') + forked_repo = retrieval_queries._get_project(self.session, 'test4') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1788,7 +1788,7 @@ class PagurePrivateRepotest(tests.Modeltests): # Check comments before self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -1812,7 +1812,7 @@ class PagurePrivateRepotest(tests.Modeltests): # No change self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -1832,7 +1832,7 @@ class PagurePrivateRepotest(tests.Modeltests): # One comment added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 1) @@ -1907,9 +1907,9 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create a pull-request - repo = pagure.lib.query._get_project(self.session, 'test4') - forked_repo = pagure.lib.query._get_project(self.session, 'test4') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test4') + forked_repo = retrieval_queries._get_project(self.session, 'test4') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1924,7 +1924,7 @@ class PagurePrivateRepotest(tests.Modeltests): # Check comments before self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 0) @@ -1951,7 +1951,7 @@ class PagurePrivateRepotest(tests.Modeltests): # No change self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 0) @@ -1996,7 +1996,7 @@ class PagurePrivateRepotest(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests failed') @@ -2043,7 +2043,7 @@ class PagurePrivateRepotest(tests.Modeltests): # One flag added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.flags), 1) self.assertEqual(request.flags[0].comment, 'Tests passed') @@ -2082,9 +2082,9 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.commit() # Create the pull-request to close - repo = pagure.lib.query._get_project(self.session, 'test4') - forked_repo = pagure.lib.query._get_project(self.session, 'test4') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test4') + forked_repo = retrieval_queries._get_project(self.session, 'test4') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -2144,7 +2144,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.add(item) self.session.commit() # Allow the token to close PR - acls = pagure.lib.query.get_acls(self.session) + acls = retrieval_queries.get_acls(self.session) acl = None for acl in acls: if acl.name == 'pull_request_close': @@ -2224,9 +2224,9 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.commit() # Create the pull-request to close - repo = pagure.lib.query._get_project(self.session, 'test4') - forked_repo = pagure.lib.query._get_project(self.session, 'test4') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test4') + forked_repo = retrieval_queries._get_project(self.session, 'test4') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='test', @@ -2287,7 +2287,7 @@ class PagurePrivateRepotest(tests.Modeltests): self.session.commit() # Allow the token to merge PR - acls = pagure.lib.query.get_acls(self.session) + acls = retrieval_queries.get_acls(self.session) acl = None for acl in acls: if acl.name == 'pull_request_merge': @@ -2525,8 +2525,8 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create private issue - repo = pagure.lib.query._get_project(self.session, 'test4') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries._get_project(self.session, 'test4') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3078,8 +3078,8 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.query._get_project(self.session, 'test4') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries._get_project(self.session, 'test4') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3091,8 +3091,8 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check status before - repo = pagure.lib.query._get_project(self.session, 'test4') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test4') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') data = { @@ -3116,8 +3116,8 @@ class PagurePrivateRepotest(tests.Modeltests): ) # No change - repo = pagure.lib.query._get_project(self.session, 'test4') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test4') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') data = { @@ -3135,8 +3135,8 @@ class PagurePrivateRepotest(tests.Modeltests): ) # No change - repo = pagure.lib.query._get_project(self.session, 'test4') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test4') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') data = { @@ -3214,8 +3214,8 @@ class PagurePrivateRepotest(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.query._get_project(self.session, 'test4') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries._get_project(self.session, 'test4') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -3229,8 +3229,8 @@ class PagurePrivateRepotest(tests.Modeltests): # Check comments before self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test4') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test4') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) data = { @@ -3253,8 +3253,8 @@ class PagurePrivateRepotest(tests.Modeltests): # No change self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test4') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test4') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') data = { @@ -3276,8 +3276,8 @@ class PagurePrivateRepotest(tests.Modeltests): # One comment added self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test4') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test4') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) @patch('pagure.lib.git.update_git') diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py index 121c645..7ea7418 100644 --- a/tests/test_pagure_flask_api_user.py +++ b/tests/test_pagure_flask_api_user.py @@ -28,7 +28,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.api import pagure.config import pagure.lib.model as model -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -262,9 +262,9 @@ class PagureFlaskApiUSertests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Create a pull-request - repo = pagure.lib.query._get_project(self.session, 'test') - forked_repo = pagure.lib.query._get_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test') + forked_repo = retrieval_queries._get_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -279,7 +279,7 @@ class PagureFlaskApiUSertests(tests.Modeltests): # Check comments before self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 0) @@ -299,7 +299,7 @@ class PagureFlaskApiUSertests(tests.Modeltests): # One comment added self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(len(request.comments), 1) @@ -315,7 +315,7 @@ class PagureFlaskApiUSertests(tests.Modeltests): # PR closed self.session.commit() - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) self.assertEqual(request.status, 'Closed') @@ -429,7 +429,7 @@ class PagureFlaskApiUSertests(tests.Modeltests): api when the user only did one action. """ tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') now = datetime.datetime.utcnow() date = now.date().strftime('%Y-%m-%d') @@ -469,7 +469,7 @@ class PagureFlaskApiUSertests(tests.Modeltests): will occur on 2018-02-15 in UTC, but on 2018-02-14 local. """ tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') dateobj = datetime.datetime(2018, 2, 15, 3, 30) utcdate = '2018-02-15' @@ -547,7 +547,7 @@ class PagureFlaskApiUSertests(tests.Modeltests): occur on 2018-02-15 in UTC, but on 2018-02-16 in local time. """ tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') dateobj = datetime.datetime(2018, 2, 15, 22, 30) utcdate = '2018-02-15' @@ -633,9 +633,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): tests.create_projects(self.session) # Create few pull-requests - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -645,9 +645,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): user='foo', ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test2') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test2') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -658,9 +658,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -671,9 +671,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): status='Closed', ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test2') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test2') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -685,9 +685,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -698,9 +698,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): status='Merged', ) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test2') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test2') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -712,9 +712,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -725,9 +725,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test2') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test2') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -738,9 +738,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -752,9 +752,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test2') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test2') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -766,9 +766,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -780,9 +780,9 @@ class PagureFlaskApiUsertestrequests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - forked_repo = pagure.lib.query.get_authorized_project(self.session, 'test2') - pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test2') + forked_repo = retrieval_queries.get_authorized_project(self.session, 'test2') + retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1056,10 +1056,10 @@ class PagureFlaskApiUsertestissues(tests.Modeltests): tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index 829f2e3..c69f2f0 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -27,7 +27,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.docs_server -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -92,7 +92,7 @@ class PagureFlaskDocstests(tests.SimplePagureTest): PagureRepo.push(remote, 'refs/heads/master:refs/heads/master') # Turn on the docs project since it's off by default - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'project_documentation': True} self.session.add(repo) self.session.commit() @@ -110,7 +110,7 @@ class PagureFlaskDocstests(tests.SimplePagureTest): tests.create_projects(self.session) # Turn on the docs project since it's off by default - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'project_documentation': True} self.session.add(repo) self.session.commit() @@ -130,7 +130,7 @@ class PagureFlaskDocstests(tests.SimplePagureTest): docs. """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') tests.create_projects_git(os.path.join(self.path, 'repos', 'docs')) output = self.app.get('/test/docs') @@ -150,7 +150,7 @@ class PagureFlaskDocstests(tests.SimplePagureTest): os.path.join(self.path, 'repos', 'docs', 'test.git'), bare=True) # Turn on the docs project since it's off by default - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.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 6e96674..e662f9b 100644 --- a/tests/test_pagure_flask_dump_load_ticket.py +++ b/tests/test_pagure_flask_dump_load_ticket.py @@ -27,7 +27,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -51,9 +51,9 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): os.makedirs(self.gitrepo) repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create an issue to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -63,7 +63,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Need another two issue to test the dependencie chain - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -71,7 +71,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): user='pingou', ) self.assertEqual(msg.title, 'Test issue #2') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #3', @@ -80,12 +80,12 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): ) self.assertEqual(msg.title, 'Test issue #3') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - issue2 = pagure.lib.query.search_issues(self.session, repo, issueid=2) - issue3 = pagure.lib.query.search_issues(self.session, repo, issueid=3) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + issue2 = retrieval_queries.search_issues(self.session, repo, issueid=2) + issue3 = retrieval_queries.search_issues(self.session, repo, issueid=3) # Add a couple of comment on the ticket - msg = pagure.lib.query.add_issue_comment( + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='Hey look a comment!', @@ -93,7 +93,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): ) self.session.commit() self.assertEqual(msg, 'Comment added') - msg = pagure.lib.query.add_issue_comment( + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='crazy right?', @@ -102,7 +102,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Comment added') # Assign the ticket to someone - msg = pagure.lib.query.add_issue_assignee( + msg = retrieval_queries.add_issue_assignee( session=self.session, issue=issue, assignee='pingou', @@ -111,7 +111,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Issue assigned to pingou') # Add a couple of tags on the ticket - msg = pagure.lib.query.add_tag_obj( + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags=[' feature ', 'future '], @@ -120,7 +120,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Issue tagged with: feature, future') # Add dependencies - msg = pagure.lib.query.add_issue_dependency( + msg = retrieval_queries.add_issue_dependency( session=self.session, issue=issue, issue_blocked=issue2, @@ -128,7 +128,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): ) self.session.commit() self.assertEqual(msg, 'Issue marked as depending on: #2') - msg = pagure.lib.query.add_issue_dependency( + msg = retrieval_queries.add_issue_dependency( session=self.session, issue=issue3, issue_blocked=issue, @@ -192,9 +192,9 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): ) # Post loading - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 1) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) # Check after re-loading self.assertEqual(len(issue.comments), 3) diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py index c9d19d0..ead264f 100644 --- a/tests/test_pagure_flask_internal.py +++ b/tests/test_pagure_flask_internal.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock, Mock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -54,9 +54,9 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -116,7 +116,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertDictEqual(js_data, {'message': 'Comment added'}) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') request = repo.requests[0] self.assertEqual(len(request.comments), 1) self.assertEqual(len(request.discussion), 1) @@ -138,8 +138,8 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -195,7 +195,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertDictEqual(js_data, {'message': 'Comment added'}) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 1) @@ -217,8 +217,8 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -284,7 +284,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertDictEqual(js_data, {'message': 'Comment added'}) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 1) @@ -305,8 +305,8 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -317,7 +317,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 0) @@ -333,10 +333,10 @@ class PagureFlaskInternaltests(tests.Modeltests): output = self.app.put('/pv/ticket/comment/', data=data) self.assertEqual(output.status_code, 403) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Let's promote him to be a ticketer # He shoudn't be able to comment even then though - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=repo, new_user='foo', @@ -345,7 +345,7 @@ class PagureFlaskInternaltests(tests.Modeltests): ) self.session.commit() self.assertEqual(msg, 'User added') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( sorted([u.username for u in repo.users]), ['foo']) self.assertEqual( @@ -356,10 +356,10 @@ class PagureFlaskInternaltests(tests.Modeltests): output = self.app.put('/pv/ticket/comment/', data=data) self.assertEqual(output.status_code, 403) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Let's promote him to be a committer # He should be able to comment - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=repo, new_user='foo', @@ -368,7 +368,7 @@ class PagureFlaskInternaltests(tests.Modeltests): ) self.session.commit() self.assertEqual(msg, 'User access updated') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( sorted([u.username for u in repo.users]), ['foo']) self.assertEqual( @@ -382,13 +382,13 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.get_data(as_text=True)) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 1) # Let's promote him to be a admin # He should be able to comment - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=repo, new_user='foo', @@ -398,7 +398,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User access updated') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( sorted([u.username for u in repo.users]), ['foo']) self.assertEqual( @@ -412,7 +412,7 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.get_data(as_text=True)) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 2) @@ -501,8 +501,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -539,7 +539,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -622,8 +622,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='master', @@ -660,7 +660,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -776,8 +776,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -812,7 +812,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -944,8 +944,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -980,7 +980,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -1096,8 +1096,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -1123,7 +1123,7 @@ class PagureFlaskInternaltests(tests.Modeltests): 'name="csrf_token" type="hidden" value="')[1].split('">')[0] # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -1231,8 +1231,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -1258,7 +1258,7 @@ class PagureFlaskInternaltests(tests.Modeltests): 'name="csrf_token" type="hidden" value="')[1].split('">')[0] # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -1392,8 +1392,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -1416,7 +1416,7 @@ class PagureFlaskInternaltests(tests.Modeltests): csrf_token = self.get_csrf(output=output) # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -1530,8 +1530,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -1554,7 +1554,7 @@ class PagureFlaskInternaltests(tests.Modeltests): csrf_token = self.get_csrf(output=output) # With all the desired information - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -2610,7 +2610,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.session.commit() # Delete the parent project - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.session.delete(project) self.session.commit() @@ -2671,7 +2671,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.session.commit() # Delete the parent project - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.session.delete(project) self.session.commit() @@ -2877,22 +2877,22 @@ class PagureFlaskInternaltests(tests.Modeltests): """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') project_key = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC4zmifEL8TLLZUZnjAuVL8495DAkpAAM2eBhwHwawBm' project_key_fp = 'SHA256:ZSUQAqpPDWi90Fs6Ow8Epc8F3qiKVfU+H5ssvo7jiI0' - pingou = pagure.lib.query.get_user(self.session, 'pingou') + pingou = retrieval_queries.get_user(self.session, 'pingou') user_key = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTsfdTcXw4rlU1aQwOTbLOXqossLwpPIk27S/G17kUz' user_key_fp = 'SHA256:jUJHzrq2Ct6Ubf7Y9rnB6tGnbHM9dMVsveyfPojm+i0' - pagure.lib.query.add_sshkey_to_project_or_user( + retrieval_queries.add_sshkey_to_project_or_user( self.session, user_key, pushaccess=True, creator=pingou, user=pingou, ) - pagure.lib.query.add_sshkey_to_project_or_user( + retrieval_queries.add_sshkey_to_project_or_user( self.session, project_key, pushaccess=True, diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py index 5009822..ee7a8d2 100644 --- a/tests/test_pagure_flask_ui_app.py +++ b/tests/test_pagure_flask_ui_app.py @@ -28,7 +28,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -232,7 +232,7 @@ class PagureFlaskApptests(tests.Modeltests): pagure.config.config['ENABLE_NEW_PROJECTS'] = False # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'project-1.git'))) @@ -268,7 +268,7 @@ class PagureFlaskApptests(tests.Modeltests): self.assertEqual(output.status_code, 404) #After - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'project-1.git'))) @@ -284,7 +284,7 @@ class PagureFlaskApptests(tests.Modeltests): def test_new_project(self): """ Test the new_project endpoint. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'project#1.git'))) @@ -353,7 +353,7 @@ class PagureFlaskApptests(tests.Modeltests): 'Overview - project-1 - Pagure', output_text) # After - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 1) self.assertTrue(os.path.exists( os.path.join(self.path, 'repos', 'project-1.git'))) @@ -369,7 +369,7 @@ class PagureFlaskApptests(tests.Modeltests): def test_adopt_repos(self): """ Test the new_project endpoint with existing git repo. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) tests.add_content_git_repo(os.path.join(self.path, 'repos', 'test.git')) @@ -398,7 +398,7 @@ class PagureFlaskApptests(tests.Modeltests): def test_adopt_repos_non_admin(self): """ Test the new_project endpoint with existing git repo for non-admins. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) tests.add_content_git_repo(os.path.join(self.path, 'repos', 'test.git')) @@ -427,7 +427,7 @@ class PagureFlaskApptests(tests.Modeltests): def test_adopt_repos_not_allowed(self): """ Test the new_project endpoint with existing git repo for no access. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) tests.add_content_git_repo(os.path.join(self.path, 'repos', 'test.git')) @@ -455,7 +455,7 @@ class PagureFlaskApptests(tests.Modeltests): def test_new_project_diff_regex(self): """ Test the new_project endpoint with a different regex. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) user = tests.FakeUser(username='foo') @@ -489,7 +489,7 @@ class PagureFlaskApptests(tests.Modeltests): def test_new_project_private(self): """ Test the new_project endpoint for a private project. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'foo', 'project#1.git'))) @@ -557,9 +557,9 @@ class PagureFlaskApptests(tests.Modeltests): 'Overview - foo/project-1 - Pagure', output_text) # After - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) - projects = pagure.lib.query.search_projects(self.session, private=True) + projects = retrieval_queries.search_projects(self.session, private=True) self.assertEqual(len(projects), 1) self.assertTrue(os.path.exists( os.path.join(self.path, 'repos', 'foo', 'project-1.git'))) @@ -573,7 +573,7 @@ class PagureFlaskApptests(tests.Modeltests): def test_non_ascii_new_project(self): """ Test the new_project endpoint with a non-ascii project. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'project-1.git'))) @@ -635,7 +635,7 @@ class PagureFlaskApptests(tests.Modeltests): output_text) # After - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 2) for project in ['project-1', 'project-2']: self.assertTrue(os.path.exists( @@ -652,7 +652,7 @@ class PagureFlaskApptests(tests.Modeltests): """ Test the new_project endpoint for a new project with a template set. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'project-1.git'))) @@ -713,7 +713,7 @@ class PagureFlaskApptests(tests.Modeltests): template_path='%s/repos/project-1.git' % self.path) # After - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 2) for project in ['project-1', 'project-2']: self.assertTrue(os.path.exists( @@ -878,8 +878,8 @@ class PagureFlaskApptests(tests.Modeltests): self.assertIn('SSH key does not exist', output_text) # Add a deploy key to a project - pingou = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query.add_sshkey_to_project_or_user( + pingou = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries.add_sshkey_to_project_or_user( session=self.session, ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==', user=pingou, @@ -1367,7 +1367,7 @@ class PagureFlaskApptests(tests.Modeltests): self.test_new_project() # Add a pending email to pingou - userobj = pagure.lib.query.search_user(self.session, username='pingou') + userobj = retrieval_queries.search_user(self.session, username='pingou') self.assertEqual(len(userobj.emails), 2) @@ -1454,7 +1454,7 @@ class PagureFlaskApptests(tests.Modeltests): ast.return_value = False # Add a pending email to pingou - userobj = pagure.lib.query.search_user(self.session, username='pingou') + userobj = retrieval_queries.search_user(self.session, username='pingou') self.assertEqual(len(userobj.emails), 2) @@ -1491,7 +1491,7 @@ class PagureFlaskApptests(tests.Modeltests): 'Email validated', output_text) - userobj = pagure.lib.query.search_user(self.session, username='pingou') + userobj = retrieval_queries.search_user(self.session, username='pingou') self.assertEqual(len(userobj.emails), 3) ast.return_value = True @@ -1512,8 +1512,8 @@ class PagureFlaskApptests(tests.Modeltests): """Test the view_user_requests endpoint. """ # Create the PR tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='dev', @@ -1544,10 +1544,10 @@ class PagureFlaskApptests(tests.Modeltests): hook_token='aaabbbttt', ) self.session.add(item) - repo = pagure.lib.query._get_project( + repo = retrieval_queries._get_project( self.session, 'test_fork', user='pingou') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='dev', @@ -1578,8 +1578,8 @@ class PagureFlaskApptests(tests.Modeltests): in another project. """ # Pingou creates the PR on test tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='dev', @@ -1593,8 +1593,8 @@ class PagureFlaskApptests(tests.Modeltests): self.assertEqual(req.title, 'test pull-request #1') # foo creates the PR on test - repo = pagure.lib.query._get_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='dev', @@ -1636,8 +1636,8 @@ class PagureFlaskApptests(tests.Modeltests): by me against a project I do not have rights on. """ # Create the PR tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='dev', @@ -1671,8 +1671,8 @@ class PagureFlaskApptests(tests.Modeltests): """Test the view_user_issues endpoint when the user exists.""" # Create the issue tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -1702,9 +1702,9 @@ class PagureFlaskApptests(tests.Modeltests): hook_token='aaabbbttt', ) self.session.add(item) - repo = pagure.lib.query._get_project(self.session, 'test_fork', user='foo') + repo = retrieval_queries._get_project(self.session, 'test_fork', user='foo') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -1716,7 +1716,7 @@ class PagureFlaskApptests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #2') # Test the assigned issue table. Create issue then set the assignee - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #3', @@ -1727,7 +1727,7 @@ class PagureFlaskApptests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue #3') - msg = pagure.lib.query.add_issue_assignee( + msg = retrieval_queries.add_issue_assignee( session=self.session, issue=msg, assignee='pingou', @@ -1756,8 +1756,8 @@ class PagureFlaskApptests(tests.Modeltests): tracking.""" # Create the issue tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -1778,7 +1778,7 @@ class PagureFlaskApptests(tests.Modeltests): 1) # Disable issue tracking - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') settings = repo.settings settings['issue_tracker'] = False repo.settings = settings @@ -1951,7 +1951,7 @@ class PagureFlaskApptests(tests.Modeltests): output_text.count( 'Active until'), 0) - user = pagure.lib.query.get_user(self.session, key='foo') + user = retrieval_queries.get_user(self.session, key='foo') self.assertEqual(len(user.tokens), 1) expiration_dt = user.tokens[0].expiration @@ -1968,7 +1968,7 @@ class PagureFlaskApptests(tests.Modeltests): 'Active until'), 0) # Ensure the expiration date did not change - user = pagure.lib.query.get_user(self.session, key='foo') + user = retrieval_queries.get_user(self.session, key='foo') self.assertEqual(len(user.tokens), 1) self.assertEqual( expiration_dt, user.tokens[0].expiration @@ -2038,7 +2038,7 @@ class PagureFlaskAppNoDocstests(tests.Modeltests): def test_new_project_no_docs_folder(self): """ Test the new_project endpoint with DOCS_FOLDER is None. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'project#1.git'))) @@ -2072,7 +2072,7 @@ class PagureFlaskAppNoDocstests(tests.Modeltests): 'Overview - project-1 - Pagure', output_text) # After - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 1) self.assertTrue(os.path.exists( os.path.join(self.path, 'repos', 'project-1.git'))) @@ -2095,7 +2095,7 @@ class PagureFlaskAppNoTicketstests(tests.Modeltests): def test_new_project_no_tickets_folder(self): """ Test the new_project endpoint with TICKETS_FOLDER is None. """ # Before - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) self.assertFalse(os.path.exists( os.path.join(self.path, 'repos', 'project#1.git'))) @@ -2129,7 +2129,7 @@ class PagureFlaskAppNoTicketstests(tests.Modeltests): 'Overview - project-1 - Pagure', output_text) # After - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 1) self.assertTrue(os.path.exists( os.path.join(self.path, 'repos', 'project-1.git'))) diff --git a/tests/test_pagure_flask_ui_app_browse.py b/tests/test_pagure_flask_ui_app_browse.py index d62db00..4466789 100644 --- a/tests/test_pagure_flask_ui_app_browse.py +++ b/tests/test_pagure_flask_ui_app_browse.py @@ -22,7 +22,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -119,8 +119,8 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): has no access to the private project. """ # Add user 'pingou' with ticket access on repo - repo = pagure.lib.query._get_project(self.session, 'test3') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test3') + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='pingou', @@ -155,8 +155,8 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): has no access to the private project. """ # Add user 'pingou' with commit access on repo - repo = pagure.lib.query._get_project(self.session, 'test3') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test3') + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='pingou', @@ -190,8 +190,8 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): has no access to the private project. """ # Add user 'pingou' with admin access on repo - repo = pagure.lib.query._get_project(self.session, 'test3') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test3') + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='pingou', @@ -240,7 +240,7 @@ class PagureFlaskAppBrowseGroupAdmintests(tests.Modeltests): self.session.commit() # Create a group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='JL', display_name='Justice League', @@ -255,8 +255,8 @@ class PagureFlaskAppBrowseGroupAdmintests(tests.Modeltests): # Add the group to project we just created, test3 # Add it with admin ACL - project = pagure.lib.query._get_project(self.session, 'test3') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test3') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -293,10 +293,10 @@ class PagureFlaskAppBrowseGroupAdmintests(tests.Modeltests): def test_browse_project_user_in_group(self): """ Test the browse project endpoint when logged in as an user that has no access to the private project via a group as admin. """ - group = pagure.lib.query.search_groups( + group = retrieval_queries.search_groups( self.session, group_name='JL') - pagure.lib.query.add_user_to_group( + retrieval_queries.add_user_to_group( session=self.session, username='pingou', group=group, @@ -345,7 +345,7 @@ class PagureFlaskAppBrowseGroupCommittests(tests.Modeltests): self.session.commit() # Create a group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='JL', display_name='Justice League', @@ -360,8 +360,8 @@ class PagureFlaskAppBrowseGroupCommittests(tests.Modeltests): # Add the group to project we just created, test3 # Add it with commit ACL - project = pagure.lib.query._get_project(self.session, 'test3') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test3') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -398,10 +398,10 @@ class PagureFlaskAppBrowseGroupCommittests(tests.Modeltests): def test_browse_project_user_in_group(self): """ Test the browse project endpoint when logged in as an user that has no access to the private project via a group as admin. """ - group = pagure.lib.query.search_groups( + group = retrieval_queries.search_groups( self.session, group_name='JL') - pagure.lib.query.add_user_to_group( + retrieval_queries.add_user_to_group( session=self.session, username='pingou', group=group, @@ -450,7 +450,7 @@ class PagureFlaskAppBrowseGroupTickettests(tests.Modeltests): self.session.commit() # Create a group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='JL', display_name='Justice League', @@ -465,8 +465,8 @@ class PagureFlaskAppBrowseGroupTickettests(tests.Modeltests): # Add the group to project we just created, test3 # Add it with ticket ACL - project = pagure.lib.query._get_project(self.session, 'test3') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries._get_project(self.session, 'test3') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -503,10 +503,10 @@ class PagureFlaskAppBrowseGroupTickettests(tests.Modeltests): def test_browse_project_user_in_group(self): """ Test the browse project endpoint when logged in as an user that has no access to the private project via a group as admin. """ - group = pagure.lib.query.search_groups( + group = retrieval_queries.search_groups( self.session, group_name='JL') - pagure.lib.query.add_user_to_group( + retrieval_queries.add_user_to_group( session=self.session, username='pingou', group=group, diff --git a/tests/test_pagure_flask_ui_app_give_project.py b/tests/test_pagure_flask_ui_app_give_project.py index 1a24b1f..a3e9ab7 100644 --- a/tests/test_pagure_flask_ui_app_give_project.py +++ b/tests/test_pagure_flask_ui_app_give_project.py @@ -25,7 +25,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -47,7 +47,7 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): def _check_user(self, user='pingou'): self.session.commit() - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test') self.assertEqual(project.user.user, user) @@ -180,10 +180,10 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): def test_give_project_not_owner_but_is_admin(self): """ Test the give_project endpoint. """ - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test') - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -276,7 +276,7 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): self._check_user('foo') # Make sure that the user giving the project is still an admin - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test') self.assertEqual(len(project.users), 1) self.assertEqual(project.users[0].user, 'pingou') @@ -287,8 +287,8 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): """ Test the give_project endpoint when the new main_admin is already a committer on the project. """ - project = pagure.lib.query._get_project(self.session, 'test') - pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + retrieval_queries.add_user_to_project( self.session, project, new_user='foo', user='pingou', @@ -318,7 +318,7 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): self._check_user('foo') # Make sure that the user giving the project is still an admin - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test') self.assertEqual(len(project.users), 1) self.assertEqual(project.users[0].user, 'pingou') @@ -359,7 +359,7 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): """ Test the give_project endpoint. """ # Create the packager group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='packager', display_name='packager group', @@ -373,8 +373,8 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): self.assertEqual(msg, 'User `pingou` added to the group `packager`.') # Add foo to the packager group - group = pagure.lib.query.search_groups(self.session, group_name='packager') - msg = pagure.lib.query.add_user_to_group( + group = retrieval_queries.search_groups(self.session, group_name='packager') + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -407,7 +407,7 @@ class PagureFlaskGiveRepotests(tests.SimplePagureTest): self._check_user('foo') # Make sure that the user giving the project is still an admin - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test') self.assertEqual(len(project.users), 1) self.assertEqual(project.users[0].user, 'pingou') diff --git a/tests/test_pagure_flask_ui_app_index.py b/tests/test_pagure_flask_ui_app_index.py index 09e2fea..4004bfe 100644 --- a/tests/test_pagure_flask_ui_app_index.py +++ b/tests/test_pagure_flask_ui_app_index.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests diff --git a/tests/test_pagure_flask_ui_app_userdash.py b/tests/test_pagure_flask_ui_app_userdash.py index a9f5a48..bc7101c 100644 --- a/tests/test_pagure_flask_ui_app_userdash.py +++ b/tests/test_pagure_flask_ui_app_userdash.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -66,8 +66,8 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): # Add foo to test with admin level - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -113,8 +113,8 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): output_text) # Add foo to test with commit level - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -161,8 +161,8 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): output_text) # Add foo to test with ticket level - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -209,8 +209,8 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): output_text) # Add foo to test with admin level - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -257,8 +257,8 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): output_text) # Add foo to test with commit level - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -306,8 +306,8 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): output_text) # Add foo to test with commit level - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', diff --git a/tests/test_pagure_flask_ui_clone.py b/tests/test_pagure_flask_ui_clone.py index 73f3486..ad80e07 100644 --- a/tests/test_pagure_flask_ui_clone.py +++ b/tests/test_pagure_flask_ui_clone.py @@ -28,7 +28,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -99,7 +99,7 @@ class PagureFlaskAppClonetests(tests.Modeltests): @patch.dict('pagure.config.config', {'ALLOW_HTTP_PULL_PUSH': True}) def test_http_clone_private_project_unauthed(self): """ Test that the HTTP endpoint enforced project.private. """ - project = pagure.lib.query._get_project(self.session, 'clonetest') + project = retrieval_queries._get_project(self.session, 'clonetest') project.private = True self.session.add(project) self.session.commit() @@ -141,7 +141,7 @@ class PagureFlaskAppClonetests(tests.Modeltests): """ Test that HTTP cloning gives reasonable output with project.private. """ # Unfortunately, actually testing a git clone would need the app to # run on a TCP port, which the test environment doesn't do. - project = pagure.lib.query._get_project(self.session, 'clonetest') + project = retrieval_queries._get_project(self.session, 'clonetest') project.private = True self.session.add(project) self.session.commit() diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 42486a6..7547cfb 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -31,7 +31,7 @@ from datetime import datetime, timedelta sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks import tests from pagure.lib.repo import PagureRepo @@ -205,8 +205,8 @@ class PagureFlaskForktests(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from=branch_from, @@ -230,7 +230,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) # View the pull-request @@ -266,7 +266,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) # View the pull-request @@ -304,8 +304,8 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) request = project.requests[0] @@ -367,8 +367,8 @@ class PagureFlaskForktests(tests.Modeltests): pagure.lib.tasks.update_pull_request(request.uid) - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) request = project.requests[0] self.assertEqual(len(request.comments), 1) @@ -483,7 +483,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') user = tests.FakeUser() user.username = 'pingou' - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') request = project.requests[0] with tests.user_set(self.app.application, user): @@ -585,7 +585,7 @@ class PagureFlaskForktests(tests.Modeltests): # Project w/o pull-request self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -599,7 +599,7 @@ class PagureFlaskForktests(tests.Modeltests): # Project w pull-request but only assignee can merge self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings['pull_requests'] = True settings['Only_assignee_can_merge_pull-request'] = True repo.settings = settings @@ -627,7 +627,7 @@ class PagureFlaskForktests(tests.Modeltests): # PR assigned but not to this user self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') req = repo.requests[0] req.assignee_id = 2 self.session.add(req) @@ -651,7 +651,7 @@ class PagureFlaskForktests(tests.Modeltests): # Project w/ minimal PR score self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings['Only_assignee_can_merge_pull-request'] = False settings['Minimum_score_to_merge_pull-request'] = 2 repo.settings = settings @@ -677,7 +677,7 @@ class PagureFlaskForktests(tests.Modeltests): # Merge self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings['Minimum_score_to_merge_pull-request'] = -1 repo.settings = settings self.session.add(repo) @@ -918,7 +918,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -989,8 +989,8 @@ class PagureFlaskForktests(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -1056,8 +1056,8 @@ class PagureFlaskForktests(tests.Modeltests): # Create a PR for these "changes" (there are none, both repos are # empty) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -1099,7 +1099,7 @@ class PagureFlaskForktests(tests.Modeltests): tests.create_projects_git( os.path.join(self.path, 'repos'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') item = pagure.lib.model.Project( user_id=2, name='test', @@ -1113,7 +1113,7 @@ class PagureFlaskForktests(tests.Modeltests): # create PR's to play with # PR-1 - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_to=repo, repo_from=item, @@ -1128,7 +1128,7 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(req.title, 'PR from the feature branch') # PR-2 - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_to=repo, branch_to='master', @@ -1142,7 +1142,7 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(req.title, 'test PR') # PR-3 - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_to=repo, branch_from='feature', @@ -1156,7 +1156,7 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(req.title, 'test Invalid PR') # PR-4 - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_to=repo, branch_from='feature', @@ -1179,7 +1179,7 @@ class PagureFlaskForktests(tests.Modeltests): self.assertIn('href="/test/pull-request/2"', tr_elements[1]) self.assertIn('href="/test/pull-request/1"', tr_elements[2]) - pr_one = pagure.lib.query.search_pull_requests( + pr_one = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=1) pr_one.last_updated = datetime.utcnow() + timedelta(seconds=2) self.session.add(pr_one) @@ -1294,7 +1294,7 @@ class PagureFlaskForktests(tests.Modeltests): # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1368,7 +1368,7 @@ index 9f44358..2a552bb 100644 self.assertEqual(patch, exp) # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1423,7 +1423,7 @@ index 9f44358..2a552bb 100644 self.assertEqual(output.get_data(as_text=True), exp) # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1541,8 +1541,8 @@ index 9f44358..2a552bb 100644 # Create a PR for these "changes" (there are none, both repos are # empty) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -1631,8 +1631,8 @@ index 0000000..2a552bb # Create a PR for these "changes" (there are none, both repos are # empty) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -1716,7 +1716,7 @@ index 0000000..2a552bb user.username = 'pingou' with tests.user_set(self.app.application, user): # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1729,7 +1729,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 404) # Project w/ pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = True repo.settings = settings @@ -1804,7 +1804,7 @@ index 0000000..2a552bb user.username = 'pingou' with tests.user_set(self.app.application, user): # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1817,7 +1817,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 404) # Project w/ pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = True repo.settings = settings @@ -1967,7 +1967,7 @@ index 0000000..2a552bb output_text) # Pull-Request closed - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') req = repo.requests[0] req.status = 'Closed' req.closed_by_in = 1 @@ -1980,7 +1980,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 200) # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -2078,7 +2078,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 403) # Make the PR be from foo - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') req = repo.requests[0] req.user_id = 2 self.session.add(req) @@ -2107,7 +2107,7 @@ index 0000000..2a552bb user.username = 'pingou' with tests.user_set(self.app.application, user): # Pull-Request closed - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') req = repo.requests[0] req.status = 'Closed' req.closed_by_in = 1 @@ -2120,7 +2120,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 200) # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -2185,8 +2185,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') self.set_up_git_repo( new_project=fork, branch_from='feature', mtype='FF') @@ -2209,8 +2209,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') self.set_up_git_repo( new_project=fork, branch_from='feature', mtype='FF') @@ -2324,8 +2324,8 @@ More information tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') # Enforce Signed-of-by in the repo settings = repo.settings @@ -2367,8 +2367,8 @@ More information tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') # Enforce Signed-of-by in the repo settings = repo.settings @@ -2435,8 +2435,8 @@ More information tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') self.set_up_git_repo( new_project=fork, branch_from='feature', mtype='FF') @@ -2473,7 +2473,7 @@ More information self.assertIn('

Test Initial Comment

', output_text) # Check if commit start and stop have been set for PR#2 - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, project_id=1, requestid=2) self.assertIsNotNone(request.commit_start) self.assertIsNotNone(request.commit_stop) @@ -2526,7 +2526,7 @@ More information tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - fork = pagure.lib.query.get_authorized_project( + fork = retrieval_queries.get_authorized_project( self.session, 'test', user='ralph') self.set_up_git_repo( @@ -2589,7 +2589,7 @@ More information os.path.join(self.path, 'requests'), bare=True) # Turn on pull-request on the fork - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') settings = repo.settings settings['pull_requests'] = True @@ -2602,7 +2602,7 @@ More information new_project=repo, branch_from='master', mtype='FF', name_from=repo.fullname) - fork = pagure.lib.query.get_authorized_project( + fork = retrieval_queries.get_authorized_project( self.session, 'test', user='ralph') self.set_up_git_repo( @@ -2682,7 +2682,7 @@ More information os.path.join(self.path, 'requests'), bare=True) # Turn on pull-request on the fork - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') settings = repo.settings settings['pull_requests'] = True @@ -2697,7 +2697,7 @@ More information new_project=repo, branch_from='master', mtype='FF', name_from=repo.fullname, prid=2) - fork = pagure.lib.query.get_authorized_project( + fork = retrieval_queries.get_authorized_project( self.session, 'test', user='ralph') self.set_up_git_repo( @@ -2790,7 +2790,7 @@ More information os.path.join(self.path, 'requests'), bare=True) # Turn on pull-request on the fork - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') settings = repo.settings settings['pull_requests'] = True @@ -2803,7 +2803,7 @@ More information new_project=repo, branch_from='master', mtype='FF', name_from=repo.fullname) - fork = pagure.lib.query.get_authorized_project( + fork = retrieval_queries.get_authorized_project( self.session, 'test2', user='ralph') self.set_up_git_repo( @@ -2835,8 +2835,8 @@ More information tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') # Create a git repo to play with gitrepo = os.path.join(self.path, 'repos', 'test.git') @@ -2885,8 +2885,8 @@ More information tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') # Create a git repo to play with gitrepo = os.path.join(self.path, 'repos', 'test.git') @@ -2951,7 +2951,7 @@ More information self.assertEqual(output_text.count('title="PY C (pingou)"'), 2) # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -2970,7 +2970,7 @@ More information self.test_pull_request_add_comment() # Project w/ pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = True repo.settings = settings @@ -3041,7 +3041,7 @@ More information output_text) # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -3144,7 +3144,7 @@ More information 'Comment updated', output_text) # Project w/o pull-request - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -3218,7 +3218,7 @@ More information self.assertEqual(output.status_code, 404) # Project requiring a merge commit - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['always_merge'] = True repo.settings = settings @@ -3661,7 +3661,7 @@ More information self.session.commit() # Get fork project - project = pagure.lib.query._get_project(self.session, 'test', 'foo') + project = retrieval_queries._get_project(self.session, 'test', 'foo') # Pull-requests and issue-trackers are off for forks # lib function is not used here so mannually turning them off @@ -3721,11 +3721,11 @@ More information tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) self.set_up_git_repo(new_project=None, branch_from='feature') - pagure.lib.query.get_authorized_project(self.session, 'test') - request = pagure.lib.query.search_pull_requests( + retrieval_queries.get_authorized_project(self.session, 'test') + request = retrieval_queries.search_pull_requests( self.session, requestid=1, project_id=1, ) - pagure.lib.query.add_pull_request_comment( + retrieval_queries.add_pull_request_comment( self.session, request=request, commit=None, diff --git a/tests/test_pagure_flask_ui_issue_pr_link.py b/tests/test_pagure_flask_ui_issue_pr_link.py index a6fc8f4..db9d61a 100644 --- a/tests/test_pagure_flask_ui_issue_pr_link.py +++ b/tests/test_pagure_flask_ui_issue_pr_link.py @@ -29,7 +29,7 @@ from mock import ANY, patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks import tests from pagure.lib.repo import PagureRepo @@ -51,10 +51,10 @@ class PagureFlaskPrIssueLinkTest(tests.Modeltests): tests.create_projects_git(os.path.join( self.path, 'repos', 'forks', 'foo'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='tést íssüé', @@ -64,7 +64,7 @@ class PagureFlaskPrIssueLinkTest(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'tést íssüé') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='tést íssüé #2', @@ -115,11 +115,11 @@ class PagureFlaskPrIssueLinkTest(tests.Modeltests): # Create the corresponding PR - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - fork_repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + fork_repo = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') - request = pagure.lib.query.new_pull_request( + request = retrieval_queries.new_pull_request( self.session, branch_from='master', repo_to=repo, diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index ae2fa04..092c4ab 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -36,7 +36,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -133,7 +133,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -212,7 +212,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -495,7 +495,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Set some milestone - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': '', 'v2.0': 'Tomorrow!'} self.session.add(repo) self.session.commit() @@ -565,7 +565,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Set some milestone - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': '', 'v2.0': 'Tomorrow!'} self.session.add(repo) self.session.commit() @@ -647,9 +647,9 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertIn( ' 0 Open Issues\n', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create some custom fields to play with - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=repo, fields=['test1'], @@ -660,13 +660,13 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'List of custom fields updated') - cfield = pagure.lib.query.get_custom_key( + cfield = retrieval_queries.get_custom_key( session=self.session, project=repo, keyname='test1') # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='tést íssüé', @@ -676,7 +676,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'tést íssüé') - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=msg, key=cfield, @@ -684,7 +684,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Custom field test1 adjusted to firstissue') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Tést íssüé with milestone', @@ -695,7 +695,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Tést íssüé with milestone') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test invalid issue', @@ -707,7 +707,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test invalid issue') - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=msg, key=cfield, @@ -843,7 +843,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertIn(' 2 Open Issues\n', output_text) # Add another issue to test sorting - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Big problÈm!', @@ -866,7 +866,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertIn('href="/test/issue/1"', tr_elements[2]) # Modify the date of the first issue and try again - issue_one = pagure.lib.query.search_issues(self.session, repo, 1) + issue_one = retrieval_queries.search_issues(self.session, repo, 1) issue_one.last_updated = datetime.utcnow() + timedelta(seconds=2) self.session.add(issue_one) self.session.commit() @@ -1002,7 +1002,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.get_data(as_text=True)) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1030,10 +1030,10 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects_git( os.path.join(self.path, 'repos'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create 2 issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue ☃', @@ -1043,7 +1043,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue ☃') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue with milestone', @@ -1083,7 +1083,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Add milestones to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') milestones = { 'v1.0': {'date': None, 'active': True}, 'v2.0': {'date': 'in the future', 'active': True}, @@ -1092,8 +1092,8 @@ class PagureFlaskIssuestests(tests.Modeltests): repo.milestones_keys = ['', 'v1.0', 'v2.0'] # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1133,8 +1133,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1198,8 +1198,8 @@ class PagureFlaskIssuestests(tests.Modeltests): csrf_token = self.get_csrf(output=output) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1238,7 +1238,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1255,8 +1255,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1333,8 +1333,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1358,10 +1358,10 @@ class PagureFlaskIssuestests(tests.Modeltests): in output_text) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add user 'foo' with ticket access on repo - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='foo', @@ -1413,8 +1413,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1425,8 +1425,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Add user 'foo' with ticket access on repo - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='foo', @@ -1437,8 +1437,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() # Set some custom fields - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.set_custom_key_fields( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.set_custom_key_fields( self.session, repo, ['bugzilla', 'upstream', 'reviewstatus'], @@ -1537,8 +1537,8 @@ class PagureFlaskIssuestests(tests.Modeltests): stone = 'käpy' # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1549,8 +1549,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Add a non-ascii milestone to the issue but project has no milestone - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - message = pagure.lib.query.edit_issue( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + message = retrieval_queries.edit_issue( self.session, issue=issue, milestone=stone, @@ -1574,7 +1574,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertNotIn(stone, output_text) # Add a non-ascii milestone to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.milestones = {'käpy': None} self.session.add(repo) self.session.commit() @@ -1600,10 +1600,10 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects_git( os.path.join(self.path, 'repos'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add custom fields to the project - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=repo, fields=['test1'], @@ -1615,7 +1615,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg, 'List of custom fields updated') # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Big problÈm!', @@ -1626,11 +1626,11 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Big problÈm!') # Assign a value to the custom key on that ticket - cfield = pagure.lib.query.get_custom_key( + cfield = retrieval_queries.get_custom_key( session=self.session, project=repo, keyname='test1') - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=msg, key=cfield, @@ -1663,8 +1663,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1898,8 +1898,8 @@ class PagureFlaskIssuestests(tests.Modeltests): in output_text) # Create another issue with a dependency - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1910,13 +1910,13 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Reset the status of the first issue - parent_issue = pagure.lib.query.search_issues( + parent_issue = retrieval_queries.search_issues( self.session, repo, issueid=1) parent_issue.status = 'Open' self.session.add(parent_issue) # Add the dependency relationship self.session.add(parent_issue) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) issue.parents.append(parent_issue) self.session.add(issue) self.session.commit() @@ -1944,8 +1944,8 @@ class PagureFlaskIssuestests(tests.Modeltests): in output_text) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1964,7 +1964,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 403) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1986,8 +1986,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2038,8 +2038,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual( output_text.count('comment_body">'), 2) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) data = { @@ -2084,8 +2084,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @patch('pagure.lib.git.update_git') @@ -2100,8 +2100,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2111,8 +2111,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -2176,8 +2176,8 @@ class PagureFlaskIssuestests(tests.Modeltests): 'Successfully edited issue #1', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, [2]) self.assertEqual(issue.blocking_text, []) @@ -2192,8 +2192,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2203,8 +2203,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -2285,8 +2285,8 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, [2]) @@ -2302,8 +2302,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2313,8 +2313,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -2347,8 +2347,8 @@ class PagureFlaskIssuestests(tests.Modeltests): 'Issue #1: Test issue - test - Pagure', output.get_data(as_text=True)) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, []) @@ -2407,8 +2407,8 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, [2]) @@ -2426,8 +2426,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos', 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2496,7 +2496,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertDictEqual(json_data, exp) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -2522,8 +2522,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2573,8 +2573,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2629,8 +2629,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2652,7 +2652,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -2666,7 +2666,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.test_upload_issue() # Project w/ issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': True} self.session.add(repo) self.session.commit() @@ -2687,7 +2687,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 200) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -2728,8 +2728,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2793,7 +2793,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

We should work on this!

'), 1) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -2813,8 +2813,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create an issue to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2882,8 +2882,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2894,8 +2894,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Add a tag to the issue - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.query.add_tag_obj( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag1', @@ -2905,7 +2905,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg, 'Issue tagged with: tag1') # Before edit, list tags - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], ['tag1']) # Edit tag @@ -2956,7 +2956,7 @@ class PagureFlaskIssuestests(tests.Modeltests): # After edit, list tags self.session.commit() - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], ['tag2']) @patch('pagure.lib.git.update_git') @@ -2986,8 +2986,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2998,8 +2998,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Add a tag to the issue - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.query.add_tag_obj( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag1', @@ -3009,7 +3009,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg, 'Issue tagged with: tag1') # Before edit, list tags - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], ['tag1']) # Edit tag @@ -3061,8 +3061,8 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'tickets')) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3120,7 +3120,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -3142,8 +3142,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3194,8 +3194,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual( output_text.count('comment_body">'), 2) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual( issue.comments[0].comment, @@ -3239,8 +3239,8 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Updated comment') @@ -3279,14 +3279,14 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Second update') # Create another issue from someone else - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3296,11 +3296,11 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.status, 'Open') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 0) self.assertEqual(issue.status, 'Open') @@ -3369,12 +3369,12 @@ class PagureFlaskIssuestests(tests.Modeltests): # Ticket #1 has one more comment and is still open self.session.commit() - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 2) self.assertEqual(issue.status, 'Open') # Ticket #2 has one less comment and is closed - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 2) self.assertEqual( issue.comments[0].comment, @@ -3400,10 +3400,10 @@ class PagureFlaskIssuestests(tests.Modeltests): user = tests.FakeUser() user.username = 'pingou' - repo = pagure.lib.query._get_project(self.session, 'test') - pagure.lib.query.update_read_only_mode(self.session, repo, read_only=False) - pingou = pagure.lib.query.get_user(self.session, 'pingou') - pagure.lib.query.add_sshkey_to_project_or_user( + repo = retrieval_queries._get_project(self.session, 'test') + retrieval_queries.update_read_only_mode(self.session, repo, read_only=False) + pingou = retrieval_queries.get_user(self.session, 'pingou') + retrieval_queries.add_sshkey_to_project_or_user( session=self.session, user=pingou, ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==', @@ -3419,7 +3419,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.get_data(as_text=True)) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': True} self.session.add(repo) self.session.commit() @@ -3460,8 +3460,8 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3472,7 +3472,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Before update, list tags - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], []) user.username = 'pingou' @@ -3726,7 +3726,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) # After update, list tags - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual( sorted([tag.tag for tag in tags]), ['blue', 'green', 'red', 'red1', 'red2', 'red3']) @@ -3742,8 +3742,8 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos')) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3754,7 +3754,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Before update, list tags - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], []) user = tests.FakeUser() @@ -3789,7 +3789,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output_text) # After update, list tags - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual(sorted([tag.tag for tag in tags]), ['is:red2']) @patch('pagure.lib.git.update_git') @@ -3813,7 +3813,7 @@ class PagureFlaskIssuestests(tests.Modeltests): bare=True) # Create 2 issues - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=1, session=self.session, repo=item, @@ -3826,7 +3826,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual(iss.project.fullname, 'ns/test3') - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=2, session=self.session, repo=item, @@ -3893,7 +3893,7 @@ class PagureFlaskIssuestests(tests.Modeltests): bare=True) # Create 2 issues - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=1, session=self.session, repo=item, @@ -3906,7 +3906,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual(iss.project.fullname, 'forks/pingou/ns/test3') - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=2, session=self.session, repo=item, @@ -3948,8 +3948,8 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'repos'), bare=True) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -4014,8 +4014,8 @@ class PagureFlaskIssuestests(tests.Modeltests): default_email='jdoe@example.com', )) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -4023,7 +4023,7 @@ class PagureFlaskIssuestests(tests.Modeltests): user='pingou', private=private, ) - pagure.lib.query.add_issue_comment( + retrieval_queries.add_issue_comment( session=self.session, issue=msg, comment='How about no', diff --git a/tests/test_pagure_flask_ui_issues_acl_checks.py b/tests/test_pagure_flask_ui_issues_acl_checks.py index 29450aa..88caf34 100644 --- a/tests/test_pagure_flask_ui_issues_acl_checks.py +++ b/tests/test_pagure_flask_ui_issues_acl_checks.py @@ -33,7 +33,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.config -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -58,8 +58,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -73,13 +73,13 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): # Add milestone repo.milestones = {'77': None} self.session.add(repo) - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( self.session, repo=repo, issueid=1 ) - pagure.lib.query.edit_issue( + retrieval_queries.edit_issue( self.session, issue, user='pingou', @@ -88,7 +88,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.session.add(repo) self.session.add(issue) - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( self.session, project=repo, fields=['abc', 'xyz'], @@ -98,10 +98,10 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(msg, 'List of custom fields updated') self.session.add(repo) - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( self.session, issue=issue, - key=pagure.lib.query.get_custom_key(self.session, repo, 'abc'), + key=retrieval_queries.get_custom_key(self.session, repo, 'abc'), value=1 ) self.session.add(issue) @@ -242,8 +242,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -299,10 +299,10 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add user 'foo' with ticket access on repo - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='foo', @@ -312,8 +312,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(msg, 'User added') self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -327,13 +327,13 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): # Add milestone repo.milestones = {'77': None} self.session.add(repo) - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( self.session, repo=repo, issueid=1 ) - pagure.lib.query.edit_issue( + retrieval_queries.edit_issue( self.session, issue, user='pingou', @@ -342,7 +342,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.session.add(repo) self.session.add(issue) - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( self.session, project=repo, fields=['abc', 'xyz'], @@ -352,10 +352,10 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(msg, 'List of custom fields updated') self.session.add(repo) - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( self.session, issue=issue, - key=pagure.lib.query.get_custom_key(self.session, repo, 'abc'), + key=retrieval_queries.get_custom_key(self.session, repo, 'abc'), value=1 ) self.session.add(issue) @@ -497,8 +497,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -554,10 +554,10 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add user 'foo' with ticket access on repo - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='foo', @@ -567,8 +567,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(msg, 'User added') self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -582,13 +582,13 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): # Add milestone repo.milestones = {'77': None} self.session.add(repo) - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( self.session, repo=repo, issueid=1 ) - pagure.lib.query.edit_issue( + retrieval_queries.edit_issue( self.session, issue, user='pingou', @@ -597,7 +597,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.session.add(repo) self.session.add(issue) - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( self.session, project=repo, fields=['abc', 'xyz'], @@ -607,10 +607,10 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(msg, 'List of custom fields updated') self.session.add(repo) - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( self.session, issue=issue, - key=pagure.lib.query.get_custom_key(self.session, repo, 'abc'), + key=retrieval_queries.get_custom_key(self.session, repo, 'abc'), value=1 ) self.session.add(issue) @@ -750,8 +750,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -807,10 +807,10 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add user 'foo' with ticket access on repo - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='foo', @@ -820,8 +820,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(msg, 'User added') self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -835,13 +835,13 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): # Add milestone repo.milestones = {'77': None} self.session.add(repo) - issue = pagure.lib.query.search_issues( + issue = retrieval_queries.search_issues( self.session, repo=repo, issueid=1 ) - pagure.lib.query.edit_issue( + retrieval_queries.edit_issue( self.session, issue, user='pingou', @@ -850,7 +850,7 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.session.add(repo) self.session.add(issue) - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( self.session, project=repo, fields=['abc', 'xyz'], @@ -860,10 +860,10 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): self.assertEqual(msg, 'List of custom fields updated') self.session.add(repo) - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( self.session, issue=issue, - key=pagure.lib.query.get_custom_key(self.session, repo, 'abc'), + key=retrieval_queries.get_custom_key(self.session, repo, 'abc'), value=1 ) self.session.add(issue) @@ -1001,8 +1001,8 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): output_text) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', diff --git a/tests/test_pagure_flask_ui_issues_open_access.py b/tests/test_pagure_flask_ui_issues_open_access.py index 3f28ea6..36cff67 100644 --- a/tests/test_pagure_flask_ui_issues_open_access.py +++ b/tests/test_pagure_flask_ui_issues_open_access.py @@ -37,7 +37,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -54,7 +54,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): tests.create_projects_git( os.path.join(self.path, 'tickets'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['open_metadata_access_to_all'] = True repo.settings = settings @@ -180,8 +180,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -231,8 +231,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): csrf_token = self.get_csrf(output=output) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -260,7 +260,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -277,8 +277,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -302,10 +302,10 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): in output_text) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add user 'foo' with ticket access on repo - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='foo', @@ -347,8 +347,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -359,8 +359,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Add user 'foo' with ticket access on repo - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, repo, new_user='foo', @@ -371,8 +371,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.session.commit() # Set some custom fields - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.set_custom_key_fields( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.set_custom_key_fields( self.session, repo, ['bugzilla', 'upstream', 'reviewstatus'], @@ -461,8 +461,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): stone = 'käpy' # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -473,8 +473,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Add a non-ascii milestone to the issue but project has no milestone - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - message = pagure.lib.query.edit_issue( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + message = retrieval_queries.edit_issue( self.session, issue=issue, milestone=stone, @@ -503,10 +503,10 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): def test_view_issue_list_no_data(self): """ Test the view_issue endpoint when the issue has a custom field of type list with no data attached. """ - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add custom fields to the project - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=repo, fields=['test1'], @@ -518,7 +518,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(msg, 'List of custom fields updated') # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Big problÈm!', @@ -529,11 +529,11 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(msg.title, 'Big problÈm!') # Assign a value to the custom key on that ticket - cfield = pagure.lib.query.get_custom_key( + cfield = retrieval_queries.get_custom_key( session=self.session, project=repo, keyname='test1') - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=msg, key=cfield, @@ -554,8 +554,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -774,8 +774,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): output_text) # Create another issue with a dependency - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -786,13 +786,13 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Reset the status of the first issue - parent_issue = pagure.lib.query.search_issues( + parent_issue = retrieval_queries.search_issues( self.session, repo, issueid=1) parent_issue.status = 'Open' self.session.add(parent_issue) # Add the dependency relationship self.session.add(parent_issue) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) issue.parents.append(parent_issue) self.session.add(issue) self.session.commit() @@ -820,8 +820,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): output_text) # Create private issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -840,7 +840,7 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual(output.status_code, 403) # Project w/o issue tracker - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -855,8 +855,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): def test_update_issue_depend(self): """ Test adding dependency via the update_issue endpoint. """ # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -866,8 +866,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -929,8 +929,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): 'Successfully edited issue #1', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, [2]) self.assertEqual(issue.blocking_text, []) @@ -939,8 +939,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): def test_update_issue_block(self): """ Test adding blocked issue via the update_issue endpoint. """ # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -950,8 +950,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -984,8 +984,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): 'Issue #1: Test issue - test - Pagure', output.get_data(as_text=True)) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, [2]) @@ -1010,8 +1010,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, [2]) @@ -1020,8 +1020,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): def test_update_issue_edit_comment(self): """ Test the issues edit comment endpoint """ # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1069,8 +1069,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertEqual( output_text.count('comment_body">'), 2) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual( issue.comments[0].comment, @@ -1111,8 +1111,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertIn('Comment updated', output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Updated comment') @@ -1149,14 +1149,14 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.assertIn('Comment updated', output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Second update') # Create another issue from someone else - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1166,11 +1166,11 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.status, 'Open') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 0) self.assertEqual(issue.status, 'Open') @@ -1227,12 +1227,12 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): # Ticket #1 has one more comment and is still open self.session.commit() - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 2) self.assertEqual(issue.status, 'Open') # Ticket #2 has one less comment and is closed - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(len(issue.comments), 2) self.assertEqual( issue.comments[0].comment, @@ -1249,8 +1249,8 @@ class PagureFlaskIssuesOpenAccesstests(tests.Modeltests): def test_view_issue_closed(self): """ Test viewing a closed issue. """ # Create issues to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', diff --git a/tests/test_pagure_flask_ui_issues_private.py b/tests/test_pagure_flask_ui_issues_private.py index bb1ed09..ef532e3 100644 --- a/tests/test_pagure_flask_ui_issues_private.py +++ b/tests/test_pagure_flask_ui_issues_private.py @@ -19,7 +19,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query # noqa +from pagure.lib import retrieval_queries # noqa import tests # noqa @@ -49,8 +49,8 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos')) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -62,7 +62,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue #1') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -132,8 +132,8 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): """ Test the list of issues when user is authenticated but has ticket level access to the project. """ - repo = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='random', @@ -157,8 +157,8 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): """ Test the list of issues when user is authenticated but has commit level access to the project. """ - repo = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='random', @@ -183,8 +183,8 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): assigned to one of the issue. """ - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) issue.assignee_id = 3 # random self.session.add(issue) self.session.commit() @@ -254,8 +254,8 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): """ Test accessing a private ticket when user is authenticated and has ticket level access to the project. """ - repo = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='random', @@ -274,8 +274,8 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): """ Test accessing a private ticket when user is authenticated and has commit level access to the project. """ - repo = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='random', @@ -303,8 +303,8 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): is assigned to one of the issue. """ - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) issue.assignee_id = 3 # random self.session.add(issue) self.session.commit() diff --git a/tests/test_pagure_flask_ui_issues_read_only.py b/tests/test_pagure_flask_ui_issues_read_only.py index 6bf58aa..116a2d9 100644 --- a/tests/test_pagure_flask_ui_issues_read_only.py +++ b/tests/test_pagure_flask_ui_issues_read_only.py @@ -20,7 +20,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query # noqa +from pagure.lib import retrieval_queries # noqa import tests # noqa @@ -37,7 +37,7 @@ class PagureFlaskIssuesReadOnlytests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos')) # Make the project's issue tracker read-only - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['issue_tracker_read_only'] = True repo.settings = settings @@ -45,7 +45,7 @@ class PagureFlaskIssuesReadOnlytests(tests.Modeltests): self.session.commit() # Create a couple of issue - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -57,7 +57,7 @@ class PagureFlaskIssuesReadOnlytests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue #1') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -336,7 +336,7 @@ class PagureFlaskIssuesAndPRDisabledtests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos')) # Make the project's issue tracker read-only - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False settings['issue_tracker_read_only'] = True @@ -345,7 +345,7 @@ class PagureFlaskIssuesAndPRDisabledtests(tests.Modeltests): self.session.commit() # Create a couple of issue - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -357,7 +357,7 @@ class PagureFlaskIssuesAndPRDisabledtests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue #1') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', diff --git a/tests/test_pagure_flask_ui_issues_templates.py b/tests/test_pagure_flask_ui_issues_templates.py index 56f0e18..d5eb5b4 100644 --- a/tests/test_pagure_flask_ui_issues_templates.py +++ b/tests/test_pagure_flask_ui_issues_templates.py @@ -24,7 +24,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -268,7 +268,7 @@ class PagureFlaskIssuesTemplatetests(tests.Modeltests): """ Test the get_ticket_template endpoint when the project has disabled its issue tracker. """ - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['issue_tracker'] = False repo.settings = settings diff --git a/tests/test_pagure_flask_ui_login.py b/tests/test_pagure_flask_ui_login.py index d1d825a..808ff77 100644 --- a/tests/test_pagure_flask_ui_login.py +++ b/tests/test_pagure_flask_ui_login.py @@ -31,7 +31,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -68,7 +68,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): """ Test the new_user endpoint. """ # Check before: - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(2, len(items)) # First access the new user page @@ -125,7 +125,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): output.get_data(as_text=True)) # Check after: - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) @patch.dict('pagure.config.config', {'PAGURE_AUTH': 'local'}) @@ -168,7 +168,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Create a local user self.test_new_user() - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) # Submit the form with the csrf token - but user not confirmed @@ -204,7 +204,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Confirm the user so that we can log in self.session.commit() - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertNotEqual(item.token, None) @@ -214,7 +214,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): self.session.commit() # Check the user - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertEqual(item.token, None) @@ -246,7 +246,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Make the password invalid self.session.commit() - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertTrue(item.password.startswith('$2$')) @@ -257,7 +257,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Check the password self.session.commit() - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertFalse(item.password.startswith('$2$')) @@ -273,7 +273,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Check the password is still not of a known version self.session.commit() - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertFalse(item.password.startswith('$1$')) self.assertFalse(item.password.startswith('$2$')) @@ -290,7 +290,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Check the password self.session.commit() - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertTrue(item.password.startswith(b'$1$')) @@ -305,7 +305,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Check the password got upgraded to version 2 self.session.commit() - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertTrue(item.password.startswith('$2$')) @@ -332,7 +332,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): self.session.commit() # Confirm the user so that we can log in - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertNotEqual(item.token, None) @@ -342,7 +342,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): self.session.commit() # Check the user - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertEqual(item.token, None) @@ -379,13 +379,13 @@ class PagureFlaskLogintests(tests.SimplePagureTest): self.session.commit() # Remove the token - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') item.token = None self.session.add(item) self.session.commit() # Check the user - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertEqual(item.token, None) @@ -418,7 +418,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): """ # Check before: - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(2, len(items)) # First access the new user page @@ -480,7 +480,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): output_text) # Check after: - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) # Checking for the /login page @@ -551,7 +551,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): 'provided by email?', output_text) # Confirm the user so that we can log in - item = pagure.lib.query.search_user(self.session, username='foobar') + item = retrieval_queries.search_user(self.session, username='foobar') self.assertEqual(item.user, 'foobar') self.assertNotEqual(item.token, None) @@ -587,7 +587,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): 'href="/logout/?next=http://localhost/dashboard/projects">', output_text) # Check the user - item = pagure.lib.query.search_user(self.session, username='foobar') + item = retrieval_queries.search_user(self.session, username='foobar') self.assertEqual(item.user, 'foobar') self.assertEqual(item.token, None) @@ -603,9 +603,9 @@ class PagureFlaskLogintests(tests.SimplePagureTest): # Create a local user self.test_new_user() - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertTrue(item.password.startswith('$2$')) self.assertNotEqual(item.token, None) @@ -686,7 +686,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): self.test_new_user() # Check the password - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertNotEqual(item.token, None) self.assertTrue(item.password.startswith('$2$')) @@ -781,7 +781,7 @@ class PagureFlaskLogintests(tests.SimplePagureTest): self.test_new_user() # Remove token of foouser - item = pagure.lib.query.search_user(self.session, username='foouser') + item = retrieval_queries.search_user(self.session, username='foouser') self.assertEqual(item.user, 'foouser') self.assertNotEqual(item.token, None) self.assertTrue(item.password.startswith('$2$')) diff --git a/tests/test_pagure_flask_ui_no_master_branch.py b/tests/test_pagure_flask_ui_no_master_branch.py index 83c9ccd..1555a1f 100644 --- a/tests/test_pagure_flask_ui_no_master_branch.py +++ b/tests/test_pagure_flask_ui_no_master_branch.py @@ -26,7 +26,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo diff --git a/tests/test_pagure_flask_ui_old_commit.py b/tests/test_pagure_flask_ui_old_commit.py index 2b0ccf8..2600b54 100644 --- a/tests/test_pagure_flask_ui_old_commit.py +++ b/tests/test_pagure_flask_ui_old_commit.py @@ -21,7 +21,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests diff --git a/tests/test_pagure_flask_ui_plugins_default_hook.py b/tests/test_pagure_flask_ui_plugins_default_hook.py index 2c9eb6d..8983239 100644 --- a/tests/test_pagure_flask_ui_plugins_default_hook.py +++ b/tests/test_pagure_flask_ui_plugins_default_hook.py @@ -28,7 +28,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.hooks.default import pagure.lib.plugins -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -39,7 +39,7 @@ class PagureFlaskPluginDefaultHooktests(tests.Modeltests): """ Test that the default hook is active on random project. """ tests.create_projects(self.session) - test = pagure.lib.query.search_projects(self.session)[0] + test = retrieval_queries.search_projects(self.session)[0] self.assertIsNone(pagure.hooks.default.Default.backref) self.assertTrue( pagure.hooks.default.Default.is_enabled_for(test) diff --git a/tests/test_pagure_flask_ui_pr_no_sources.py b/tests/test_pagure_flask_ui_pr_no_sources.py index 70a9962..5039423 100644 --- a/tests/test_pagure_flask_ui_pr_no_sources.py +++ b/tests/test_pagure_flask_ui_pr_no_sources.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -62,14 +62,14 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): repo_path = os.path.join(self.path, 'repos', item.path) pygit2.init_repository(repo_path, bare=True) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - fork = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project(self.session, 'test') + fork = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') self.set_up_git_repo(repo=project, fork=fork) # Ensure things got setup straight - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) # wait for the worker to process the task @@ -158,8 +158,8 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=fork, branch_from=branch_from, @@ -177,7 +177,7 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): def test_request_pull_reference(self): """ Test if there is a reference created for a new PR. """ - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) gitrepo = os.path.join(self.path, 'repos', 'test.git') @@ -190,7 +190,7 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): def test_request_pull_fork_reference(self): """ Test if there the references created on the fork. """ - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') self.assertEqual(len(project.requests), 0) @@ -205,7 +205,7 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): """ Test accessing the PR if the fork has been deleted. """ # Delete fork on disk - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') repo_path = os.path.join(self.path, 'repos', project.path) self.assertTrue(os.path.exists(repo_path)) @@ -224,7 +224,7 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): """ Test accessing the PR's patch if the fork has been deleted. """ # Delete fork on disk - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') repo_path = os.path.join(self.path, 'repos', project.path) self.assertTrue(os.path.exists(repo_path)) @@ -245,7 +245,7 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): def test_accessing_pr_branch_deleted(self): """ Test accessing the PR if branch it originates from has been deleted. """ - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') # Check the branches before @@ -278,7 +278,7 @@ class PagureFlaskPrNoSourcestests(tests.Modeltests): def test_accessing_pr_patch_branch_deleted(self): """ Test accessing the PR's patch if branch it originates from has been deleted. """ - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, 'test', user='foo') # Check the branches before diff --git a/tests/test_pagure_flask_ui_priorities.py b/tests/test_pagure_flask_ui_priorities.py index aaa1088..5cd2c97 100644 --- a/tests/test_pagure_flask_ui_priorities.py +++ b/tests/test_pagure_flask_ui_priorities.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -93,7 +93,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Set some priorities - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.priorities = {'1': 'High', '2': 'Normal'} self.session.add(repo) self.session.commit() @@ -141,7 +141,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Set some priorities - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -176,7 +176,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): '
' 'Project Settings
\n', output_text) # Check the result of the action -- None, no CSRF - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) data = { @@ -196,7 +196,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Project Settings\n', output_text) # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {'': '', '1': 'High'}) data = { @@ -221,7 +221,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text.find('Normal') < output_text.find('Low')) # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -248,7 +248,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'not of the same length', output_text) # Check the result of the action -- Priorities un-changed self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -275,7 +275,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text) # Check the result of the action -- Priorities un-changed self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -302,7 +302,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text) # Check the result of the action -- Priorities un-changed self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -329,7 +329,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text) # Check the result of the action -- Priorities un-changed self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -375,7 +375,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Start from scrach on priorities - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -413,7 +413,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -475,7 +475,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): # Check the result of the action -- Priority reset self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) @patch('pagure.lib.git.update_git') @@ -489,7 +489,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Start from scrach on priorities - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -527,7 +527,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -590,7 +590,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @@ -602,7 +602,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Start from scrach on priorities - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -641,7 +641,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '-1': 'Sky Falling', '0': 'Urgent', @@ -736,7 +736,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Start from scrach on priorities - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -775,7 +775,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '-1': 'Sky Falling', '0': 'Urgent', @@ -848,7 +848,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Start from scrach on priorities - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -887,7 +887,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '-1': 'Sky Falling', '0': 'Urgent', @@ -958,7 +958,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Check the default priorities - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) self.assertEqual(repo.default_priority, None) @@ -991,7 +991,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text.find('Normal') < output_text.find('Low')) # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -1012,7 +1012,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Project Settings\n', output_text) # Check the result of the action -- default_priority no change self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.default_priority, None) # Try setting the default priority @@ -1033,7 +1033,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'to High', output_text) # Check the result of the action -- default_priority no change self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.default_priority, 'High') # Try setting a wrong default priority @@ -1051,7 +1051,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Project Settings\n', output_text) # Check the result of the action -- default_priority no change self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.default_priority, 'High') # reset the default priority @@ -1072,7 +1072,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text) # Check the result of the action -- default_priority no change self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.default_priority, None) # Check the behavior if the project disabled the issue tracker @@ -1114,7 +1114,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Check the default priorities - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) self.assertEqual(repo.default_priority, None) @@ -1147,7 +1147,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text.find('Normal') < output_text.find('Low')) # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'High', '2': 'Normal', '3': 'Low'} @@ -1171,7 +1171,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'to High', output_text) # Check the result of the action -- default_priority no change self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.default_priority, 'High') # Remove the Hight priority @@ -1202,7 +1202,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): output_text.find('Normal') < output_text.find('Low')) # Check the result of the action -- Priority recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {'': '', '1': 'Normal', '2': 'Low'} @@ -1218,14 +1218,14 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) # Set some priority and the default one - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.priorities = {'1': 'High', '2': 'Normal'} repo.default_priority = 'Normal' self.session.add(repo) self.session.commit() # Check the default priorities - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {'1': 'High', '2': 'Normal'}) self.assertEqual(repo.default_priority, 'Normal') @@ -1253,7 +1253,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'href="/test/issue/1/edit" title="Edit this issue">', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 1) self.assertEqual(repo.issues[0].priority, 2) diff --git a/tests/test_pagure_flask_ui_quick_reply.py b/tests/test_pagure_flask_ui_quick_reply.py index 99870b6..3941e26 100644 --- a/tests/test_pagure_flask_ui_quick_reply.py +++ b/tests/test_pagure_flask_ui_quick_reply.py @@ -22,7 +22,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib.model import pagure.lib.plugins -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.hooks import tests @@ -39,7 +39,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): self.admin = tests.FakeUser(username='pingou') self.user = tests.FakeUser(username='ralph') - self.repo = pagure.lib.query._get_project(self.session, 'test') + self.repo = retrieval_queries._get_project(self.session, 'test') def disable_issues_and_pull_requests(self): """Disable both issues and pull requests.""" @@ -86,7 +86,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): def assertQuickReplies(self, quick_replies, project='test'): self.session.commit() - repo = pagure.lib.query._get_project(self.session, project) + repo = retrieval_queries._get_project(self.session, project) self.assertEqual(repo.quick_replies, quick_replies) def assertQuickReplyLinks(self, output): @@ -147,7 +147,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): def test_update_quick_replies_empty_to_reset(self): # Set some quick replies - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') repo.quick_replies = ['Ship it!', 'Nah.'] self.session.add(repo) self.session.commit() @@ -208,7 +208,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): def test_issue_page_has_quick_replies(self, p_ugt): self.setup_quick_replies() - issue = pagure.lib.query.new_issue( + issue = retrieval_queries.new_issue( self.session, self.repo, 'Dummy issue', @@ -230,7 +230,7 @@ class PagureFlaskQuickReplytest(tests.Modeltests): self.setup_quick_replies() - pr = pagure.lib.query.new_pull_request( + pr = retrieval_queries.new_pull_request( self.session, 'pr', self.repo, diff --git a/tests/test_pagure_flask_ui_remote_pr.py b/tests/test_pagure_flask_ui_remote_pr.py index c4b9ba1..d261835 100644 --- a/tests/test_pagure_flask_ui_remote_pr.py +++ b/tests/test_pagure_flask_ui_remote_pr.py @@ -30,7 +30,7 @@ from bs4 import BeautifulSoup sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo from pagure.lib.git import _make_signature @@ -173,7 +173,7 @@ class PagureRemotePRtests(tests.Modeltests): self.set_up_git_repo() # Before - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 0) # Try creating a remote PR @@ -193,8 +193,8 @@ class PagureRemotePRtests(tests.Modeltests): self.set_up_git_repo() # Before - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 0) # Try creating a remote PR @@ -231,8 +231,8 @@ class PagureRemotePRtests(tests.Modeltests): '
\n', output_text) # Not saved yet - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 0) data = { @@ -276,8 +276,8 @@ class PagureRemotePRtests(tests.Modeltests): '\n sources', output_text) # Remote PR Created - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) @@ -323,8 +323,8 @@ class PagureRemotePRtests(tests.Modeltests): ) # Before - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 0) # Try creating a remote PR @@ -360,8 +360,8 @@ class PagureRemotePRtests(tests.Modeltests): '
\n', output_text) # Not saved yet - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 0) data = { @@ -392,8 +392,8 @@ class PagureRemotePRtests(tests.Modeltests): '\n sources', output_text) # Remote PR Created - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) # Check the merge state of the PR @@ -439,8 +439,8 @@ class PagureRemotePRtests(tests.Modeltests): self.set_up_git_repo() # Before - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 0) # Create a remote PR @@ -481,8 +481,8 @@ class PagureRemotePRtests(tests.Modeltests): '
\n', output_text) # Remote PR Created - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) trigger_ci.assert_not_called() @@ -497,8 +497,8 @@ class PagureRemotePRtests(tests.Modeltests): self.set_up_git_repo() # Before - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 0) # Create a remote PR @@ -556,8 +556,8 @@ class PagureRemotePRtests(tests.Modeltests): '
\n', output_text) # Remote PR Created - self.session = pagure.lib.query.create_session(self.dbpath) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) trigger_ci.assert_not_called() diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 5c3fac2..08f0ca2 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -29,7 +29,7 @@ from mock import ANY, patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -346,7 +346,7 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/test/addgroup') self.assertEqual(output.status_code, 302) - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='foo', group_type='bar', @@ -455,7 +455,7 @@ class PagureFlaskRepotests(tests.Modeltests): ast.return_value = False - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='foo', display_name='foo group', @@ -544,8 +544,8 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Add an user to a project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -614,9 +614,9 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertIn('Deploy key does not exist in project', output_text) # Add a deploy key to a project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pingou = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query.add_sshkey_to_project_or_user( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + pingou = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries.add_sshkey_to_project_or_user( session=self.session, project=repo, ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==', @@ -712,9 +712,9 @@ class PagureFlaskRepotests(tests.Modeltests): 'access on the repo', output_text) # Add an user to a project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 0) - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -734,7 +734,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn( 'User removed', output_text) self.assertIn('action="/test/dropuser/2">', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 1) data = {'csrf_token': csrf_token} @@ -750,7 +750,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn('action="/test/dropuser/2">', output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 0) mock_log.assert_called_with(ANY, topic='project.user.removed', msg=ANY) @@ -765,9 +765,9 @@ class PagureFlaskRepotests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'repos')) # Add an user to a project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 0) - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -797,7 +797,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'User removed', output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 0) mock_log.assert_called_with(ANY, topic='project.user.removed', msg=ANY) @@ -836,7 +836,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create the new group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( session=self.session, group_name='testgrp', group_type='user', @@ -849,9 +849,9 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(msg, 'User `pingou` added to the group `testgrp`.') self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add the group to a project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='testgrp', @@ -923,7 +923,7 @@ class PagureFlaskRepotests(tests.Modeltests): output_text) # Create the new group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( session=self.session, group_name='testgrp', group_type='user', @@ -936,9 +936,9 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(msg, 'User `pingou` added to the group `testgrp`.') self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add the group to a project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='testgrp', @@ -947,7 +947,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Group added') - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.groups), 1) with tests.user_set(self.app.application, user): @@ -961,7 +961,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn( 'Group removed', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.groups), 1) data = {'csrf_token': csrf_token} @@ -978,7 +978,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn('action="/test/dropgroup/1">', output_text) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.groups), 0) @patch('pagure.decorators.admin_session_timedout') @@ -1297,8 +1297,8 @@ class PagureFlaskRepotests(tests.Modeltests): tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos')) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.set_custom_key_fields( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.set_custom_key_fields( self.session, repo, ['bugzilla', 'upstream', 'reviewstatus'], ['link', 'boolean', 'list'], @@ -1366,7 +1366,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'value="y" name="pull_request_access_only" checked=""/>', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(gen_acl.call_count, 1) args = gen_acl.call_args self.assertEqual(args[0], tuple()) @@ -1545,8 +1545,8 @@ class PagureFlaskRepotests(tests.Modeltests): tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) - pingou = pagure.lib.query.get_user(self.session, 'pingou') - pagure.lib.query.add_sshkey_to_project_or_user( + pingou = retrieval_queries.get_user(self.session, 'pingou') + retrieval_queries.add_sshkey_to_project_or_user( session=self.session, user=pingou, ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==', @@ -1554,8 +1554,8 @@ class PagureFlaskRepotests(tests.Modeltests): creator=pingou, ) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') - pagure.lib.query.update_read_only_mode(self.session, repo, read_only=False) + repo = retrieval_queries._get_project(self.session, 'test') + retrieval_queries.update_read_only_mode(self.session, repo, read_only=False) self.session.commit() user = tests.FakeUser(username='pingou') with tests.user_set(self.app.application, user): @@ -1620,10 +1620,10 @@ class PagureFlaskRepotests(tests.Modeltests): should see a message instead of url for SSH cloning. """ tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) - repo = pagure.lib.query._get_project(self.session, 'test') - pagure.lib.query.update_read_only_mode(self.session, repo, read_only=True) - pingou = pagure.lib.query.get_user(self.session, 'pingou') - pagure.lib.query.add_sshkey_to_project_or_user( + repo = retrieval_queries._get_project(self.session, 'test') + retrieval_queries.update_read_only_mode(self.session, repo, read_only=True) + pingou = retrieval_queries.get_user(self.session, 'pingou') + retrieval_queries.add_sshkey_to_project_or_user( session=self.session, user=pingou, ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==', @@ -1724,7 +1724,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.perfReset() # Turn that repo into a fork - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.parent_id = 2 repo.is_fork = True self.session.add(repo) @@ -1898,7 +1898,7 @@ class PagureFlaskRepotests(tests.Modeltests): tests.add_readme_git_repo(os.path.join(self.path, 'repos', 'test.git')) # Turn that repo into a fork - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.parent_id = 2 repo.is_fork = True self.session.add(repo) @@ -1985,7 +1985,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'Commits - test - Pagure', output_text) # Turn that repo into a fork - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.parent_id = 2 repo.is_fork = True self.session.add(repo) @@ -3175,7 +3175,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 302) # Ensure the project isn't read-only - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.read_only = False self.session.add(repo) self.session.commit() @@ -3211,8 +3211,8 @@ index 0000000..fb7093d output_text) # add issues - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3222,7 +3222,7 @@ index 0000000..fb7093d self.session.commit() self.assertEqual(msg.title, 'Test issue') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -3233,8 +3233,8 @@ index 0000000..fb7093d self.assertEqual(msg.title, 'Test issue #2') # Add a comment to an issue - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.query.add_issue_comment( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='Hey look a comment!', @@ -3244,7 +3244,7 @@ index 0000000..fb7093d self.assertEqual(msg, 'Comment added') # add pull-requests - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -3257,7 +3257,7 @@ index 0000000..fb7093d self.assertEqual(req.id, 3) self.assertEqual(req.title, 'test pull-request') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature2', @@ -3271,10 +3271,10 @@ index 0000000..fb7093d self.assertEqual(req.title, 'test pull-request') # Add comment on a pull-request - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, requestid=3) - msg = pagure.lib.query.add_pull_request_comment( + msg = retrieval_queries.add_pull_request_comment( session=self.session, request=request, commit='commithash', @@ -3300,9 +3300,9 @@ index 0000000..fb7093d output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 404) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertNotEqual(repo, None) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') + repo = retrieval_queries.get_authorized_project(self.session, 'test2') self.assertNotEqual(repo, None) # Add a fork of a fork @@ -3367,7 +3367,7 @@ index 0000000..fb7093d user = tests.FakeUser(username='pingou') with tests.user_set(self.app.application, user): - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertNotEqual(repo, None) repo.read_only = True self.session.add(repo) @@ -3415,7 +3415,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 302) # Ensure the project isn't read-only - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.read_only = False self.session.add(repo) self.session.commit() @@ -3563,8 +3563,8 @@ index 0000000..fb7093d output_text) # add issues - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -3574,7 +3574,7 @@ index 0000000..fb7093d self.session.commit() self.assertEqual(msg.title, 'Test issue') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -3585,8 +3585,8 @@ index 0000000..fb7093d self.assertEqual(msg.title, 'Test issue #2') # Add a comment to an issue - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.query.add_issue_comment( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='Hey look a comment!', @@ -3596,7 +3596,7 @@ index 0000000..fb7093d self.assertEqual(msg, 'Comment added') # add pull-requests - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -3609,7 +3609,7 @@ index 0000000..fb7093d self.assertEqual(req.id, 3) self.assertEqual(req.title, 'test pull-request') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature2', @@ -3623,10 +3623,10 @@ index 0000000..fb7093d self.assertEqual(req.title, 'test pull-request') # Add comment on a pull-request - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, requestid=3) - msg = pagure.lib.query.add_pull_request_comment( + msg = retrieval_queries.add_pull_request_comment( session=self.session, request=request, commit='commithash', @@ -3680,9 +3680,9 @@ index 0000000..fb7093d
""", output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo, None) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') + repo = retrieval_queries.get_authorized_project(self.session, 'test2') self.assertNotEqual(repo, None) # Add a fork of a fork @@ -3766,7 +3766,7 @@ index 0000000..fb7093d tests.create_projects_git(os.path.join(self.path, 'repos')) # Ensure the project isn't read-only - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.read_only = False self.session.add(repo) self.session.commit() @@ -3860,8 +3860,8 @@ index 0000000..fb7093d output_text) # add user - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -3872,7 +3872,7 @@ index 0000000..fb7093d # Ensure the project isn't read-only (because adding an user # will trigger an ACL refresh, thus read-only) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.read_only = False self.session.add(repo) self.session.commit() @@ -3887,9 +3887,9 @@ index 0000000..fb7093d self.assertNotIn( 'Forks ', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertNotEqual(repo, None) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') + repo = retrieval_queries.get_authorized_project(self.session, 'test2') self.assertEqual(repo, None) # Delete the project @@ -3918,9 +3918,9 @@ index 0000000..fb7093d
""", output_text) # Check after - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo, None) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') + repo = retrieval_queries.get_authorized_project(self.session, 'test2') self.assertEqual(repo, None) @patch('pagure.lib.notify.send_email') @@ -3965,7 +3965,7 @@ index 0000000..fb7093d output_text) # Create group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='foo', display_name='foo group', @@ -3979,8 +3979,8 @@ index 0000000..fb7093d self.assertEqual(msg, 'User `pingou` added to the group `foo`.') # Add group to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.add_group_to_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='foo', @@ -3991,13 +3991,13 @@ index 0000000..fb7093d # Ensure the project isn't read-only (because adding a group # will trigger an ACL refresh, thus read-only) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.read_only = False self.session.add(repo) self.session.commit() # check if group where we expect it - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.projects_groups), 1) # Check before deleting the project @@ -4010,7 +4010,7 @@ index 0000000..fb7093d self.assertNotIn( 'Forks ', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertNotEqual(repo, None) # Delete the project @@ -4039,7 +4039,7 @@ index 0000000..fb7093d
""", output_text) # Check after - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo, None) @patch('pagure.lib.notify.send_email') @@ -4084,8 +4084,8 @@ index 0000000..fb7093d output_text) # Create the issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -4096,9 +4096,9 @@ index 0000000..fb7093d self.assertEqual(msg.title, 'Test issue') # Add a tag to the issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.query.add_tag_obj( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag1', @@ -4117,9 +4117,9 @@ index 0000000..fb7093d self.assertNotIn( 'Forks ', output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertNotEqual(repo, None) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') + repo = retrieval_queries.get_authorized_project(self.session, 'test2') self.assertEqual(repo, None) # Delete the project @@ -4148,9 +4148,9 @@ index 0000000..fb7093d
""", output_text) # Check after - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo, None) - repo = pagure.lib.query.get_authorized_project(self.session, 'test2') + repo = retrieval_queries.get_authorized_project(self.session, 'test2') self.assertEqual(repo, None) @patch('pagure.decorators.admin_session_timedout') @@ -4160,7 +4160,7 @@ index 0000000..fb7093d tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos')) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') user = tests.FakeUser() @@ -4187,7 +4187,7 @@ index 0000000..fb7093d pagure.config.config['WEBHOOK'] = False - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') user.username = 'pingou' @@ -4198,7 +4198,7 @@ index 0000000..fb7093d data = {'csrf_token': csrf_token} - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') output = self.app.post( @@ -4211,7 +4211,7 @@ index 0000000..fb7093d pagure.config.config['WEBHOOK'] = False self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertNotEqual(repo.hook_token, 'aaabbbccc') @patch('pagure.lib.notify.send_email') @@ -4261,8 +4261,8 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 400) # Create an issue to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -4282,8 +4282,8 @@ index 0000000..fb7093d output_text) # Create a request to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='branch', @@ -4379,7 +4379,7 @@ index 0000000..fb7093d tests.create_projects_git( os.path.join(self.path, 'repos'), bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['Enforce_signed-off_commits_in_pull-request'] = True repo.settings = settings @@ -4625,7 +4625,7 @@ index 0000000..fb7093d tests.add_readme_git_repo( os.path.join(self.path, 'repos', 'test.git')) - user = pagure.lib.query.search_user(self.session, username='pingou') + user = retrieval_queries.search_user(self.session, username='pingou') self.assertEquals(len(user.emails), 2) self.assertEquals(user.default_email, 'bar@pingou.com') @@ -5137,7 +5137,7 @@ index 0000000..fb7093d output_text) # Existing token will expire in 60 days - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.tokens[0].expiration.date(), datetime.datetime.utcnow().date() + datetime.timedelta(days=60)) @@ -5158,7 +5158,7 @@ index 0000000..fb7093d # Existing token has been expired self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.tokens[0].expiration.date(), repo.tokens[0].created.date()) @@ -5231,7 +5231,7 @@ index 0000000..fb7093d output_text) # 1 token associated with the project, expires in 60 days - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tokens), 1) self.assertEqual( repo.tokens[0].expiration.date(), @@ -5253,7 +5253,7 @@ index 0000000..fb7093d # Existing token has been renewed self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tokens), 2) self.assertEqual( repo.tokens[0].expiration.date(), @@ -5648,8 +5648,8 @@ index 0000000..fb7093d '
'), output_text) - project = pagure.lib.query._get_project(self.session, 'test') - pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + retrieval_queries.add_user_to_project( self.session, project, new_user='foo', user='pingou', @@ -5732,11 +5732,11 @@ index 0000000..fb7093d output_text) # Create a report - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') self.assertEqual(project.reports, {}) name = 'test report' url = '?foo=bar&baz=biz' - pagure.lib.query.save_report( + retrieval_queries.save_report( self.session, repo=project, name=name, @@ -5744,7 +5744,7 @@ index 0000000..fb7093d username=None ) self.session.commit() - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') self.assertEqual( project.reports, {'test report': {'baz': 'biz', 'foo': 'bar'}} @@ -5762,7 +5762,7 @@ index 0000000..fb7093d 'Settings - test - Pagure', output_text) - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') self.assertEqual( project.reports, {'test report': {'baz': 'biz', 'foo': 'bar'}} @@ -5781,7 +5781,7 @@ index 0000000..fb7093d 'List of reports updated', output_text) self.session.commit() - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') self.assertEqual(project.reports, {}) def test_delete_report_ns_project(self): @@ -5844,12 +5844,12 @@ index 0000000..fb7093d # Create a report self.session.commit() - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test', namespace='foo') self.assertEqual(project.reports, {}) name = 'test report' url = '?foo=bar&baz=biz' - pagure.lib.query.save_report( + retrieval_queries.save_report( self.session, repo=project, name=name, @@ -5857,7 +5857,7 @@ index 0000000..fb7093d username=None ) self.session.commit() - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test', namespace='foo') self.assertEqual( project.reports, @@ -5876,7 +5876,7 @@ index 0000000..fb7093d 'Settings - foo/test - Pagure', output_text) - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test', namespace='foo') self.assertEqual( project.reports, @@ -5897,7 +5897,7 @@ index 0000000..fb7093d output_text) self.session.commit() - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test', namespace='foo') self.assertEqual(project.reports, {}) diff --git a/tests/test_pagure_flask_ui_repo_delete_project.py b/tests/test_pagure_flask_ui_repo_delete_project.py index e17ec5e..95bcb8b 100644 --- a/tests/test_pagure_flask_ui_repo_delete_project.py +++ b/tests/test_pagure_flask_ui_repo_delete_project.py @@ -21,7 +21,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -45,7 +45,7 @@ class PagureFlaskDeleteRepotests(tests.Modeltests): tests.create_projects_git( os.path.join(self.path, 'repos', 'requests'), bare=True) - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test') self.assertIsNotNone(project) # Ensure the project isn't read-only @@ -54,7 +54,7 @@ class PagureFlaskDeleteRepotests(tests.Modeltests): self.session.commit() # Create a fork - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=self.session, user='pingou', repo=project, @@ -62,7 +62,7 @@ class PagureFlaskDeleteRepotests(tests.Modeltests): task.get() # Ensure everything was correctly created - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 4) @patch.dict('pagure.config.config', {'ENABLE_DEL_PROJECTS': False}) @@ -79,7 +79,7 @@ class PagureFlaskDeleteRepotests(tests.Modeltests): output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 404) - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 4) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) @@ -97,7 +97,7 @@ class PagureFlaskDeleteRepotests(tests.Modeltests): self.assertIn('
' 'Project Settings\n', output_text) # Check the result of the action -- None, no CSRF - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {}) data = { @@ -213,7 +213,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): # Check the result of the action -- Milestones recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {'1': {'active': False, 'date': None}}) data = { @@ -237,7 +237,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn('Milestones updated', output_text) # Check the result of the action -- Milestones recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, { @@ -268,7 +268,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): 'Project Settings\n', output_text) # Check the result of the action -- Milestones un-changed self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, { @@ -304,7 +304,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): output_text) # Check the result of the action -- Milestones un-changed self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, { @@ -339,7 +339,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): output_text) # Check the result of the action -- Milestones updated self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, { @@ -415,7 +415,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn('Milestones updated', output_text) # Check the result of the action -- Milestones recorded self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, { @@ -476,7 +476,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): # Check the result of the action -- Milestones recorded self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual( repo.milestones, { @@ -541,11 +541,11 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn( '' % mstone, output_text) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Mark ticket #1 as Fixed for iid in [1, 4]: - ticket = pagure.lib.query.search_issues( + ticket = retrieval_queries.search_issues( self.session, repo, issueid=iid @@ -599,7 +599,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): output = self.app.get('/foo/roadmap') self.assertEqual(output.status_code, 404) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') settings = repo.settings settings['issue_tracker'] = False repo.settings = settings diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py index f3b7774..86ea754 100644 --- a/tests/test_pagure_flask_ui_slash_branch_name.py +++ b/tests/test_pagure_flask_ui_slash_branch_name.py @@ -26,7 +26,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo diff --git a/tests/test_pagure_flask_ui_star_project.py b/tests/test_pagure_flask_ui_star_project.py index e9b4800..bd49150 100644 --- a/tests/test_pagure_flask_ui_star_project.py +++ b/tests/test_pagure_flask_ui_star_project.py @@ -22,7 +22,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.config -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -234,7 +234,7 @@ class TestStarProjectUI(tests.SimplePagureTest): self.assertEqual( output_text.count('
'), 2) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.stargazers), 1) # make pingou unstar the project @@ -254,8 +254,8 @@ class TestStarProjectUI(tests.SimplePagureTest): ) self._check_star_count(data=data, stars=0) - self.session = pagure.lib.query.create_session(self.dbpath) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + self.session = retrieval_queries.create_session(self.dbpath) + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.stargazers), 0) # now, test if test's name comes in pingou's stars diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 29bf980..d0786c8 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -26,7 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.model import tests @@ -44,7 +44,7 @@ class PagureLibtests_search_user(tests.Modeltests): """ # Retrieve all users - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(2, len(items)) self.assertEqual(2, items[0].id) self.assertEqual('foo', items[0].user) @@ -61,12 +61,12 @@ class PagureLibtests_search_user(tests.Modeltests): """ # Retrieve user by username - item = pagure.lib.query.search_user(self.session, username='foo') + item = retrieval_queries.search_user(self.session, username='foo') self.assertEqual('foo', item.user) self.assertEqual('foo', item.username) self.assertEqual([], item.groups) - item = pagure.lib.query.search_user(self.session, username='bar') + item = retrieval_queries.search_user(self.session, username='bar') self.assertEqual(None, item) def test_search_user_email(self): @@ -75,17 +75,17 @@ class PagureLibtests_search_user(tests.Modeltests): """ # Retrieve user by email - item = pagure.lib.query.search_user(self.session, email='foo@foo.com') + item = retrieval_queries.search_user(self.session, email='foo@foo.com') self.assertEqual(None, item) - item = pagure.lib.query.search_user(self.session, email='foo@bar.com') + item = retrieval_queries.search_user(self.session, email='foo@bar.com') self.assertEqual('foo', item.user) self.assertEqual('foo', item.username) self.assertEqual([], item.groups) self.assertEqual( ['foo@bar.com'], [email.email for email in item.emails]) - item = pagure.lib.query.search_user(self.session, email='foo@pingou.com') + item = retrieval_queries.search_user(self.session, email='foo@pingou.com') self.assertEqual('pingou', item.user) self.assertEqual( sorted(['bar@pingou.com', 'foo@pingou.com']), @@ -97,7 +97,7 @@ class PagureLibtests_search_user(tests.Modeltests): """ # Retrieve user by token - item = pagure.lib.query.search_user(self.session, token='aaa') + item = retrieval_queries.search_user(self.session, token='aaa') self.assertEqual(None, item) item = pagure.lib.model.User( @@ -109,7 +109,7 @@ class PagureLibtests_search_user(tests.Modeltests): self.session.add(item) self.session.commit() - item = pagure.lib.query.search_user(self.session, token='aaabbb') + item = retrieval_queries.search_user(self.session, token='aaabbb') self.assertEqual('pingou2', item.user) self.assertEqual('PY C', item.fullname) @@ -119,7 +119,7 @@ class PagureLibtests_search_user(tests.Modeltests): """ # Retrieve user by pattern - item = pagure.lib.query.search_user(self.session, pattern='a*') + item = retrieval_queries.search_user(self.session, pattern='a*') self.assertEqual([], item) item = pagure.lib.model.User( @@ -131,7 +131,7 @@ class PagureLibtests_search_user(tests.Modeltests): self.session.add(item) self.session.commit() - items = pagure.lib.query.search_user(self.session, pattern='p*') + items = retrieval_queries.search_user(self.session, pattern='p*') self.assertEqual(2, len(items)) self.assertEqual(1, items[0].id) self.assertEqual('pingou', items[0].user) @@ -162,7 +162,7 @@ class PagureLibtests_search_projects(tests.Modeltests): Test the method returns all the projects for the given session """ - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 3) self.assertEqual(projects[0].id, 1) self.assertEqual(projects[1].id, 2) @@ -171,10 +171,10 @@ class PagureLibtests_search_projects(tests.Modeltests): """ Test the method returns all the projects for the given username """ - projects = pagure.lib.query.search_projects(self.session, username='foo') + projects = retrieval_queries.search_projects(self.session, username='foo') self.assertEqual(len(projects), 0) - projects = pagure.lib.query.search_projects(self.session, username='pingou') + projects = retrieval_queries.search_projects(self.session, username='pingou') self.assertEqual(len(projects), 3) self.assertEqual(projects[0].id, 1) self.assertEqual(projects[1].id, 2) @@ -183,7 +183,7 @@ class PagureLibtests_search_projects(tests.Modeltests): """ Test the method returns all the projects for the given start """ - projects = pagure.lib.query.search_projects(self.session, start=1) + projects = retrieval_queries.search_projects(self.session, start=1) self.assertEqual(len(projects), 2) self.assertEqual(projects[0].id, 2) @@ -191,7 +191,7 @@ class PagureLibtests_search_projects(tests.Modeltests): """ Test the method returns all the projects for the given limit """ - projects = pagure.lib.query.search_projects(self.session, limit=1) + projects = retrieval_queries.search_projects(self.session, limit=1) self.assertEqual(len(projects), 1) self.assertEqual(projects[0].id, 1) @@ -199,7 +199,7 @@ class PagureLibtests_search_projects(tests.Modeltests): """ Test the method returns the count of the projects """ - projects = pagure.lib.query.search_projects(self.session, count=True) + projects = retrieval_queries.search_projects(self.session, count=True) self.assertEqual(projects, 3) def test_search_projects_commit_access(self): @@ -209,8 +209,8 @@ class PagureLibtests_search_projects(tests.Modeltests): # Also check if the project shows up if a user doesn't # have admin access in the project # Check with commit access first - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -220,7 +220,7 @@ class PagureLibtests_search_projects(tests.Modeltests): self.assertEqual(msg, 'User added') self.session.commit() - projects = pagure.lib.query.search_projects(self.session, username='foo') + projects = retrieval_queries.search_projects(self.session, username='foo') self.assertEqual(len(projects), 1) def test_search_projects_ticket_access(self): @@ -228,8 +228,8 @@ class PagureLibtests_search_projects(tests.Modeltests): Test the method does not returns the project of user with only ticket access """ # Now check with only ticket access - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -238,12 +238,12 @@ class PagureLibtests_search_projects(tests.Modeltests): ) self.assertEqual(msg, 'User added') self.session.commit() - projects = pagure.lib.query.search_projects(self.session, username='foo') + projects = retrieval_queries.search_projects(self.session, username='foo') self.assertEqual(len(projects), 0) def test_search_project_forked(self): """ - Test the search_project for forked projects in pagure.lib.query. + Test the search_project for forked projects in retrieval_queries. """ # Create two forked repo @@ -268,9 +268,9 @@ class PagureLibtests_search_projects(tests.Modeltests): self.session.add(item) # Since we have two forks, let's search them - projects = pagure.lib.query.search_projects(self.session, fork=True) + projects = retrieval_queries.search_projects(self.session, fork=True) self.assertEqual(len(projects), 2) - projects = pagure.lib.query.search_projects(self.session, fork=False) + projects = retrieval_queries.search_projects(self.session, fork=False) self.assertEqual(len(projects), 3) def test_search_projects_private(self): @@ -289,7 +289,7 @@ class PagureLibtests_search_projects(tests.Modeltests): self.session.commit() # non authenticated - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 3) self.assertEqual( [p.path for p in projects], @@ -298,7 +298,7 @@ class PagureLibtests_search_projects(tests.Modeltests): ) # non authenticated - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( self.session, username='pingou') self.assertEqual(len(projects), 3) self.assertEqual( @@ -308,7 +308,7 @@ class PagureLibtests_search_projects(tests.Modeltests): ) # authenticated as pingou - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( self.session, username='pingou', private='pingou') self.assertEqual(len(projects), 4) self.assertEqual( @@ -318,7 +318,7 @@ class PagureLibtests_search_projects(tests.Modeltests): ) # authenticated as foo - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( self.session, username='pingou', private='foo') self.assertEqual(len(projects), 3) self.assertEqual( @@ -333,7 +333,7 @@ class PagureLibtests_search_projects(tests.Modeltests): """ # Add tags to the project - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') tag = pagure.lib.model.Tag( tag='fedora' ) @@ -346,7 +346,7 @@ class PagureLibtests_search_projects(tests.Modeltests): self.session.add(tp) self.session.commit() - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( self.session, tags='fedora') self.assertEqual(len(projects), 1) self.assertEqual(projects[0].path, 'test.git') @@ -356,7 +356,7 @@ class PagureLibtests_search_projects(tests.Modeltests): Test the method returns all the projects for the given pattern """ - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( self.session, pattern='test*') self.assertEqual(len(projects), 3) self.assertEqual( @@ -369,7 +369,7 @@ class PagureLibtests_search_projects(tests.Modeltests): Test the method returns all the projects sorted by lastest and oldest """ - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( self.session, pattern='*', sort='latest') self.assertEqual(len(projects), 3) self.assertEqual( @@ -377,7 +377,7 @@ class PagureLibtests_search_projects(tests.Modeltests): ['somenamespace/test3.git', 'test2.git', 'test.git'] ) - projects = pagure.lib.query.search_projects( + projects = retrieval_queries.search_projects( self.session, pattern='*', sort='oldest') self.assertEqual(len(projects), 3) self.assertEqual( @@ -392,56 +392,56 @@ class PagureLibtests(tests.Modeltests): maxDiff = None def test_get_repotypes(self): - """ Test the get_repotypes function of pagure.lib.query. """ + """ Test the get_repotypes function of retrieval_queries. """ with patch.dict(pagure.config.config, {"ENABLE_TICKETS": False, "ENABLE_DOCS": False}): self.assertEqual( set(("main", "requests")), - set(pagure.lib.query.get_repotypes()) + set(retrieval_queries.get_repotypes()) ) with patch.dict(pagure.config.config, {"ENABLE_TICKETS": True, "ENABLE_DOCS": False}): self.assertEqual( set(("main", "requests", "tickets")), - set(pagure.lib.query.get_repotypes()) + set(retrieval_queries.get_repotypes()) ) with patch.dict(pagure.config.config, {"ENABLE_TICKETS": False, "ENABLE_DOCS": True}): self.assertEqual( set(("main", "requests", "docs")), - set(pagure.lib.query.get_repotypes()) + set(retrieval_queries.get_repotypes()) ) with patch.dict(pagure.config.config, {"ENABLE_TICKETS": True, "ENABLE_DOCS": True}): self.assertEqual( set(("main", "requests", "tickets", "docs")), - set(pagure.lib.query.get_repotypes()) + set(retrieval_queries.get_repotypes()) ) def test_get_next_id(self): - """ Test the get_next_id function of pagure.lib.query. """ + """ Test the get_next_id function of retrieval_queries. """ tests.create_projects(self.session) - self.assertEqual(1, pagure.lib.query.get_next_id(self.session, 1)) + self.assertEqual(1, retrieval_queries.get_next_id(self.session, 1)) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_new_issue(self, p_send_email, p_ugt): - """ Test the new_issue of pagure.lib.query. """ + """ Test the new_issue of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # Set some priorities to the project repo.priorities = {'1': 'High', '2': 'Normal'} self.session.add(repo) self.session.commit() # Before - issues = pagure.lib.query.search_issues(self.session, repo) + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 0) self.assertEqual(repo.open_tickets, 0) self.assertEqual(repo.open_tickets_public, 0) @@ -449,7 +449,7 @@ class PagureLibtests(tests.Modeltests): # See where it fails self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.new_issue, + retrieval_queries.new_issue, session=self.session, repo=repo, title='Test issue', @@ -460,7 +460,7 @@ class PagureLibtests(tests.Modeltests): # Fails since we're trying to give a non-existant priority self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.new_issue, + retrieval_queries.new_issue, session=self.session, repo=repo, title='Test issue', @@ -470,8 +470,8 @@ class PagureLibtests(tests.Modeltests): ) # Add an extra user to project `foo` - repo = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + repo = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -483,7 +483,7 @@ class PagureLibtests(tests.Modeltests): # Try adding again this extra user to project `foo` self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foo', @@ -493,7 +493,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'User added') # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -505,7 +505,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(repo.open_tickets, 1) self.assertEqual(repo.open_tickets_public, 1) - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -519,26 +519,26 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(repo.open_tickets_public, 2) # After - issues = pagure.lib.query.search_issues(self.session, repo) + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 2) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_edit_issue(self, p_send_email, p_ugt): - """ Test the edit_issue of pagure.lib.query. """ + """ Test the edit_issue of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(repo.open_tickets, 2) self.assertEqual(repo.open_tickets_public, 2) # Edit the issue - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -546,7 +546,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, None) - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -557,7 +557,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, None) - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -577,7 +577,7 @@ class PagureLibtests(tests.Modeltests): ] ) - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -596,14 +596,14 @@ class PagureLibtests(tests.Modeltests): ] ) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_tickets, 1) self.assertEqual(repo.open_tickets_public, 1) self.assertEqual(repo.issues[1].status, 'Closed') self.assertEqual(repo.issues[1].close_status, 'Fixed') # Edit the status: re-open the ticket - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -619,7 +619,7 @@ class PagureLibtests(tests.Modeltests): ] ) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') for issue in repo.issues: self.assertEqual(issue.status, 'Open') self.assertEqual(issue.close_status, None) @@ -628,7 +628,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(repo.open_tickets_public, 1) # Edit the status: re-close the ticket - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -645,7 +645,7 @@ class PagureLibtests(tests.Modeltests): ] ) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_tickets, 1) self.assertEqual(repo.open_tickets_public, 1) self.assertEqual(repo.issues[1].status, 'Closed') @@ -654,24 +654,24 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_edit_issue_close_status(self, p_send_email, p_ugt): - """ Test the edit_issue of pagure.lib.query. """ + """ Test the edit_issue of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(issue.status, 'Open') self.assertEqual(issue.close_status, None) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_tickets, 2) self.assertEqual(repo.open_tickets_public, 2) # Edit the issue, providing just a close_status should also close # the ticket - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -680,17 +680,17 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, ['Issue close_status updated to: Fixed']) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(issue.status, 'Closed') self.assertEqual(issue.close_status, 'Fixed') - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_tickets, 1) self.assertEqual(repo.open_tickets_public, 1) # Edit the issue, editing the status to open, should reset the # close_status - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -700,11 +700,11 @@ class PagureLibtests(tests.Modeltests): self.assertEqual( msg, ['Issue status updated to: Open (was: Closed)']) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(issue.status, 'Open') self.assertEqual(issue.close_status, None) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_tickets, 2) self.assertEqual(repo.open_tickets_public, 2) @@ -718,11 +718,11 @@ class PagureLibtests(tests.Modeltests): self.test_new_issue() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) # Set some priorities to the repo - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') repo.priorities = {'1': 'High', '2': 'Normal'} self.session.add(repo) self.session.commit() @@ -731,7 +731,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(repo.open_tickets_public, 2) # Edit the issue -- Wrong priority value: No changes - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -741,7 +741,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, None) # Edit the issue -- Good priority - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -756,7 +756,7 @@ class PagureLibtests(tests.Modeltests): ) # Edit the issue -- Update priority - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -780,10 +780,10 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create 3 issues - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #1', @@ -794,7 +794,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue #1') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -805,7 +805,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue #2') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #3', @@ -816,13 +816,13 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue #3') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual(repo.open_tickets, 3) self.assertEqual(repo.open_tickets_public, 3) # Make issue #2 blocking on issue #1 - msgs = pagure.lib.query.update_blocked_issue( + msgs = retrieval_queries.update_blocked_issue( self.session, repo, issue, @@ -832,7 +832,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msgs, ['Issue marked as blocking: #1']) # Make issue #2 depend on issue #3 - msgs = pagure.lib.query.update_dependency_issue( + msgs = retrieval_queries.update_dependency_issue( self.session, repo, issue, @@ -842,8 +842,8 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msgs, ['Issue marked as depending on: #3']) # Edit the issue #3 - issue = pagure.lib.query.search_issues(self.session, repo, issueid=3) - msg = pagure.lib.query.edit_issue( + issue = retrieval_queries.search_issues(self.session, repo, issueid=3) + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -851,7 +851,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, None) - msg = pagure.lib.query.edit_issue( + msg = retrieval_queries.edit_issue( session=self.session, issue=issue, user='pingou', @@ -874,16 +874,16 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(repo.open_tickets, 2) self.assertEqual(repo.open_tickets_public, 2) - @patch('pagure.lib.query.REDIS', MagicMock(return_value=True)) + @patch('retrieval_queries.REDIS', MagicMock(return_value=True)) @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_add_issue_dependency(self): - """ Test the add_issue_dependency of pagure.lib.query. """ + """ Test the add_issue_dependency of retrieval_queries. """ self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - issue_blocked = pagure.lib.query.search_issues( + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + issue_blocked = retrieval_queries.search_issues( self.session, repo, issueid=2) # Before @@ -894,14 +894,14 @@ class PagureLibtests(tests.Modeltests): self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_issue_dependency, + retrieval_queries.add_issue_dependency, session=self.session, issue=issue, issue_blocked=issue, user='pingou', ) - msg = pagure.lib.query.add_issue_dependency( + msg = retrieval_queries.add_issue_dependency( session=self.session, issue=issue, issue_blocked=issue_blocked, @@ -925,28 +925,28 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issue_blocked.depending_text, [1]) self.assertEqual(issue_blocked.blocking_text, []) - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_edit_comment(self, mock_redis): - """ Test the edit_issue of pagure.lib.query. """ + """ Test the edit_issue of retrieval_queries. """ mock_redis.return_value = True self.test_add_issue_comment() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_tickets, 2) self.assertEqual(repo.open_tickets_public, 2) self.assertEqual(mock_redis.publish.call_count, 0) # Before - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Hey look a comment!') # Edit one of the - msg = pagure.lib.query.edit_comment( + msg = retrieval_queries.edit_comment( session=self.session, parent=issue, comment=issue.comments[0], @@ -958,31 +958,31 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(mock_redis.publish.call_count, 1) # After - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Edited comment') - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_edit_comment_private(self, mock_redis): - """ Test the edit_issue of pagure.lib.query. """ + """ Test the edit_issue of retrieval_queries. """ self.test_add_issue_comment_private() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_tickets, 1) self.assertEqual(repo.open_tickets_public, 0) self.assertEqual(mock_redis.publish.call_count, 0) # Before - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Hey look a comment!') # Edit one of the - msg = pagure.lib.query.edit_comment( + msg = retrieval_queries.edit_comment( session=self.session, parent=issue, comment=issue.comments[0], @@ -994,20 +994,20 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(mock_redis.publish.call_count, 1) # After - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Edited comment') @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') def test_add_tag_obj(self, mock_redis): - """ Test the add_tag_obj of pagure.lib.query. """ + """ Test the add_tag_obj of retrieval_queries. """ mock_redis.return_value=True self.test_edit_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertFalse(issue.private) self.assertFalse(issue.project.private) @@ -1015,7 +1015,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(args), 4) # Add a tag to the issue - msg = pagure.lib.query.add_tag_obj( + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag1', @@ -1034,7 +1034,7 @@ class PagureLibtests(tests.Modeltests): ) # Try a second time - msg = pagure.lib.query.add_tag_obj( + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag1', @@ -1043,7 +1043,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Nothing to add') - issues = pagure.lib.query.search_issues(self.session, repo, tags='tag1') + issues = retrieval_queries.search_issues(self.session, repo, tags='tag1') self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 1) self.assertEqual(issues[0].project_id, 1) @@ -1053,23 +1053,23 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_remove_tags(self, p_send_email, p_ugt): - """ Test the remove_tags of pagure.lib.query. """ + """ Test the remove_tags of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.remove_tags, + retrieval_queries.remove_tags, session=self.session, project=repo, tags='foo', user='pingou', ) - msgs = pagure.lib.query.remove_tags( + msgs = retrieval_queries.remove_tags( session=self.session, project=repo, tags='tag1', @@ -1078,17 +1078,17 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msgs, ['Tag: tag1 has been deleted']) - @patch('pagure.lib.query.REDIS', MagicMock(return_value=True)) + @patch('retrieval_queries.REDIS', MagicMock(return_value=True)) @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_remove_tags_obj(self): - """ Test the remove_tags_obj of pagure.lib.query. """ + """ Test the remove_tags_obj of retrieval_queries. """ self.test_add_tag_obj() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) - msgs = pagure.lib.query.remove_tags_obj( + msgs = retrieval_queries.remove_tags_obj( session=self.session, obj=issue, tags='tag1', @@ -1106,8 +1106,8 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) # Add a tag to the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - msg = pagure.lib.query.add_tag_obj( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + msg = retrieval_queries.add_tag_obj( self.session, repo, tags=['pagure', 'test'], user='pingou', @@ -1116,11 +1116,11 @@ class PagureLibtests(tests.Modeltests): self.session.commit() # Check the tags - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.tags_text, ['pagure', 'test']) # Remove one of the the tag - msgs = pagure.lib.query.remove_tags_obj( + msgs = retrieval_queries.remove_tags_obj( session=self.session, obj=repo, tags='test', @@ -1130,23 +1130,23 @@ class PagureLibtests(tests.Modeltests): self.session.commit() # Check the tags - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(repo.tags_text, ['pagure']) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_edit_issue_tags(self, p_send_email, p_ugt): - """ Test the edit_issue_tags of pagure.lib.query. """ + """ Test the edit_issue_tags of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.edit_issue_tags, + retrieval_queries.edit_issue_tags, session=self.session, project=repo, old_tag='foo', @@ -1158,7 +1158,7 @@ class PagureLibtests(tests.Modeltests): self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.edit_issue_tags, + retrieval_queries.edit_issue_tags, session=self.session, project=repo, old_tag=None, @@ -1168,7 +1168,7 @@ class PagureLibtests(tests.Modeltests): user='pingou', ) - msgs = pagure.lib.query.edit_issue_tags( + msgs = retrieval_queries.edit_issue_tags( session=self.session, project=repo, old_tag='tag1', @@ -1186,7 +1186,7 @@ class PagureLibtests(tests.Modeltests): # Try editing the tag without changing anything self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.edit_issue_tags, + retrieval_queries.edit_issue_tags, session=self.session, project=repo, old_tag='tag2', @@ -1197,7 +1197,7 @@ class PagureLibtests(tests.Modeltests): ) # Add a new tag - msg = pagure.lib.query.add_tag_obj( + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag3', @@ -1210,7 +1210,7 @@ class PagureLibtests(tests.Modeltests): # Attempt to rename an existing tag into another existing one self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.edit_issue_tags, + retrieval_queries.edit_issue_tags, session=self.session, project=repo, old_tag='tag2', @@ -1221,7 +1221,7 @@ class PagureLibtests(tests.Modeltests): ) # Rename an existing tag - msgs = pagure.lib.query.edit_issue_tags( + msgs = retrieval_queries.edit_issue_tags( session=self.session, project=repo, old_tag='tag2', @@ -1236,15 +1236,15 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_search_issues(self, p_send_email, p_ugt): - """ Test the search_issues of pagure.lib.query. """ + """ Test the search_issues of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_edit_issue() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # All issues - issues = pagure.lib.query.search_issues(self.session, repo) + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 2) self.assertEqual(issues[1].id, 1) self.assertEqual(issues[1].project_id, 1) @@ -1257,7 +1257,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issues[0].tags, []) # Issues by status - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, status='Closed') self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 2) @@ -1267,7 +1267,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issues[0].tags, []) # Issues closed - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, closed=True) self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 2) @@ -1277,19 +1277,19 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issues[0].tags, []) # Issues by tag - issues = pagure.lib.query.search_issues(self.session, repo, tags='foo') + issues = retrieval_queries.search_issues(self.session, repo, tags='foo') self.assertEqual(len(issues), 0) - issues = pagure.lib.query.search_issues(self.session, repo, tags='!foo') + issues = retrieval_queries.search_issues(self.session, repo, tags='!foo') self.assertEqual(len(issues), 2) # Issue by id - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.title, 'Test issue') self.assertEqual(issue.user.user, 'pingou') self.assertEqual(issue.tags, []) # Issues by authors - issues = pagure.lib.query.search_issues(self.session, repo, author='foo') + issues = retrieval_queries.search_issues(self.session, repo, author='foo') self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 2) self.assertEqual(issues[0].project_id, 1) @@ -1298,33 +1298,33 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issues[0].tags, []) # Issues by assignee - issues = pagure.lib.query.search_issues(self.session, repo, assignee='foo') + issues = retrieval_queries.search_issues(self.session, repo, assignee='foo') self.assertEqual(len(issues), 0) - issues = pagure.lib.query.search_issues(self.session, repo, assignee='!foo') + issues = retrieval_queries.search_issues(self.session, repo, assignee='!foo') self.assertEqual(len(issues), 2) - issues = pagure.lib.query.search_issues(self.session, repo, private='foo') + issues = retrieval_queries.search_issues(self.session, repo, private='foo') self.assertEqual(len(issues), 2) - @patch('pagure.lib.query.REDIS', MagicMock(return_value=True)) + @patch('retrieval_queries.REDIS', MagicMock(return_value=True)) @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_add_issue_assignee(self): - """ Test the add_issue_assignee of pagure.lib.query. """ + """ Test the add_issue_assignee of retrieval_queries. """ self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) # Before - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, assignee='pingou') self.assertEqual(len(issues), 0) # Test when it fails self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_issue_assignee, + retrieval_queries.add_issue_assignee, session=self.session, issue=issue, assignee='foo@foobar.com', @@ -1333,7 +1333,7 @@ class PagureLibtests(tests.Modeltests): self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_issue_assignee, + retrieval_queries.add_issue_assignee, session=self.session, issue=issue, assignee='foo@bar.com', @@ -1341,7 +1341,7 @@ class PagureLibtests(tests.Modeltests): ) # Set the assignee by its email - msg = pagure.lib.query.add_issue_assignee( + msg = retrieval_queries.add_issue_assignee( session=self.session, issue=issue, assignee='foo@bar.com', @@ -1351,7 +1351,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Issue assigned to foo@bar.com') # Change the assignee to someone else by its username - msg = pagure.lib.query.add_issue_assignee( + msg = retrieval_queries.add_issue_assignee( session=self.session, issue=issue, assignee='pingou', @@ -1361,7 +1361,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Issue assigned to pingou (was: foo)') # After -- Searches by assignee - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, assignee='pingou') self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 2) @@ -1369,7 +1369,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issues[0].status, 'Open') self.assertEqual(issues[0].tags, []) - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, assignee=True) self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 2) @@ -1378,7 +1378,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issues[0].status, 'Open') self.assertEqual(issues[0].tags, []) - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, assignee=False) self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 1) @@ -1388,7 +1388,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issues[0].tags, []) # Reset the assignee to no-one - msg = pagure.lib.query.add_issue_assignee( + msg = retrieval_queries.add_issue_assignee( session=self.session, issue=issue, assignee=None, @@ -1397,31 +1397,31 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Assignee reset') - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, assignee=False) self.assertEqual(len(issues), 2) self.assertEqual(issues[0].id, 2) self.assertEqual(issues[1].id, 1) - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, assignee=True) self.assertEqual(len(issues), 0) - @patch('pagure.lib.query.REDIS', MagicMock(return_value=True)) + @patch('retrieval_queries.REDIS', MagicMock(return_value=True)) @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_add_issue_comment(self): - """ Test the add_issue_comment of pagure.lib.query. """ + """ Test the add_issue_comment of retrieval_queries. """ self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # Before - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) # Set the assignee by its email - msg = pagure.lib.query.add_issue_assignee( + msg = retrieval_queries.add_issue_assignee( session=self.session, issue=issue, assignee='foo@bar.com', @@ -1431,7 +1431,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Issue assigned to foo@bar.com') # Add a comment to that issue - msg = pagure.lib.query.add_issue_comment( + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='Hey look a comment!', @@ -1441,20 +1441,20 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Comment added') # After - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Hey look a comment!') self.assertEqual(issue.comments[0].user.user, 'foo') - @patch('pagure.lib.query.REDIS', MagicMock(return_value=True)) + @patch('retrieval_queries.REDIS', MagicMock(return_value=True)) @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_add_issue_comment_private(self): - """ Test the add_issue_comment of pagure.lib.query. """ + """ Test the add_issue_comment of retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=project, title='Test issue #1', @@ -1469,11 +1469,11 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(project.open_tickets_public, 0) # Before - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + issue = retrieval_queries.search_issues(self.session, project, issueid=1) self.assertEqual(len(issue.comments), 0) # Add a comment to that issue - msg = pagure.lib.query.add_issue_comment( + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='Hey look a comment!', @@ -1483,33 +1483,33 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Comment added') # After - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + issue = retrieval_queries.search_issues(self.session, project, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Hey look a comment!') self.assertEqual(issue.comments[0].user.user, 'foo') @patch('pagure.lib.notify.send_email') def test_add_user_to_project(self, p_send_email): - """ Test the add_user_to_project of pagure.lib.query. """ + """ Test the add_user_to_project of retrieval_queries. """ p_send_email.return_value = True tests.create_projects(self.session) # Before - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 0) # Add an user to a project self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foobar', user='pingou', ) - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -1519,7 +1519,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'User added') # After - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 1) self.assertEqual(repo.users[0].user, 'foo') self.assertEqual(repo.admins[0].user, 'foo') @@ -1527,7 +1527,7 @@ class PagureLibtests(tests.Modeltests): # Try adding the same user with the same access self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foo', @@ -1536,7 +1536,7 @@ class PagureLibtests(tests.Modeltests): ) # Update the access of the user - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -1550,7 +1550,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(repo.committers[0].user, 'foo') def test_new_project(self): - """ Test the new_project of pagure.lib.query. """ + """ Test the new_project of retrieval_queries. """ gitfolder = os.path.join(self.path, 'repos') docfolder = os.path.join(gitfolder, 'docs') ticketfolder = os.path.join(gitfolder, 'tickets') @@ -1559,7 +1559,7 @@ class PagureLibtests(tests.Modeltests): # Try creating a blacklisted project self.assertRaises( pagure.exceptions.ProjectBlackListedException, - pagure.lib.query.new_project, + retrieval_queries.new_project, session=self.session, user='pingou', name='static', @@ -1573,7 +1573,7 @@ class PagureLibtests(tests.Modeltests): # Try creating a project that's blacklisted by wildcard match self.assertRaises( pagure.exceptions.ProjectBlackListedException, - pagure.lib.query.new_project, + retrieval_queries.new_project, session=self.session, user='pingou', namespace='space', @@ -1588,7 +1588,7 @@ class PagureLibtests(tests.Modeltests): # Try creating a 40 chars project self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.new_project, + retrieval_queries.new_project, session=self.session, user='pingou', name='s' * 40, @@ -1603,7 +1603,7 @@ class PagureLibtests(tests.Modeltests): # Create a new project pagure.config.config['GIT_FOLDER'] = gitfolder - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -1623,7 +1623,7 @@ class PagureLibtests(tests.Modeltests): # Try creating an existing project using a different case self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.new_project, + retrieval_queries.new_project, session=self.session, user='pingou', name='TestProject', @@ -1636,7 +1636,7 @@ class PagureLibtests(tests.Modeltests): # Now test that creation fails if ignore_existing_repo is False self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'testproject') + repo = retrieval_queries.get_authorized_project(self.session, 'testproject') self.assertEqual(repo.path, 'testproject.git') gitrepo = os.path.join(gitfolder, repo.path) @@ -1652,7 +1652,7 @@ class PagureLibtests(tests.Modeltests): # Try re-creating it but all repos are existing self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.new_project, + retrieval_queries.new_project, session=self.session, user='pingou', name='testproject', @@ -1672,7 +1672,7 @@ class PagureLibtests(tests.Modeltests): # Try re-creating it ignoring the existing repos- but repo in the DB self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.new_project, + retrieval_queries.new_project, session=self.session, user='pingou', name='testproject', @@ -1685,11 +1685,11 @@ class PagureLibtests(tests.Modeltests): self.session.rollback() # Re-create it, ignoring the existing repos on disk - repo = pagure.lib.query._get_project(self.session, 'testproject') + repo = retrieval_queries._get_project(self.session, 'testproject') self.session.delete(repo) self.session.commit() - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -1708,7 +1708,7 @@ class PagureLibtests(tests.Modeltests): 'namespace': None}) # Delete the repo from the DB so we can try again - repo = pagure.lib.query._get_project(self.session, 'testproject') + repo = retrieval_queries._get_project(self.session, 'testproject') self.session.delete(repo) self.session.commit() @@ -1719,7 +1719,7 @@ class PagureLibtests(tests.Modeltests): # Drop the main git repo and try again shutil.rmtree(gitrepo) - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -1740,7 +1740,7 @@ class PagureLibtests(tests.Modeltests): # Drop the doc repo and try again shutil.rmtree(docrepo) with self.assertRaises(pagure.exceptions.RepoExistsException): - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -1759,7 +1759,7 @@ class PagureLibtests(tests.Modeltests): # Drop the request repo and try again shutil.rmtree(ticketrepo) with self.assertRaises(pagure.exceptions.RepoExistsException): - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -1776,7 +1776,7 @@ class PagureLibtests(tests.Modeltests): self.assertTrue(os.path.exists(requestrepo)) # Re-Try creating a 40 chars project this time allowing it - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='pingou/' + 's' * 40, @@ -1802,7 +1802,7 @@ class PagureLibtests(tests.Modeltests): # Create a new project with user_ns as True pagure.config.config['GIT_FOLDER'] = gitfolder - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -1820,7 +1820,7 @@ class PagureLibtests(tests.Modeltests): 'repo': 'testproject', 'namespace': 'pingou'}) - repo = pagure.lib.query._get_project( + repo = retrieval_queries._get_project( self.session, 'testproject', namespace='pingou') self.assertEqual(repo.path, 'pingou/testproject.git') @@ -1835,7 +1835,7 @@ class PagureLibtests(tests.Modeltests): # Create a new project with a namespace and user_ns as True pagure.config.config['GIT_FOLDER'] = gitfolder - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject2', @@ -1854,7 +1854,7 @@ class PagureLibtests(tests.Modeltests): 'repo': 'testproject2', 'namespace': 'testns'}) - repo = pagure.lib.query._get_project( + repo = retrieval_queries._get_project( self.session, 'testproject2', namespace='testns') self.assertEqual(repo.path, 'testns/testproject2.git') @@ -1869,16 +1869,16 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.notify.log') def test_update_project_settings(self, mock_log): - """ Test the update_project_settings of pagure.lib.query. """ + """ Test the update_project_settings of retrieval_queries. """ tests.create_projects(self.session) # Before - repo = pagure.lib.query._get_project(self.session, 'test2') + repo = retrieval_queries._get_project(self.session, 'test2') self.assertTrue(repo.settings['issue_tracker']) self.assertFalse(repo.settings['project_documentation']) - msg = pagure.lib.query.update_project_settings( + msg = retrieval_queries.update_project_settings( session=self.session, repo=repo, settings={ @@ -1903,7 +1903,7 @@ class PagureLibtests(tests.Modeltests): # Invalid `Minimum_score_to_merge_pull-request` self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.update_project_settings, + retrieval_queries.update_project_settings, session=self.session, repo=repo, settings={ @@ -1922,7 +1922,7 @@ class PagureLibtests(tests.Modeltests): user='pingou', ) - msg = pagure.lib.query.update_project_settings( + msg = retrieval_queries.update_project_settings( session=self.session, repo=repo, settings={ @@ -1955,61 +1955,61 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(args[1]['topic'], 'project.edit') # After - repo = pagure.lib.query._get_project(self.session, 'test2') + repo = retrieval_queries._get_project(self.session, 'test2') self.assertFalse(repo.settings['issue_tracker']) self.assertTrue(repo.settings['project_documentation']) self.assertFalse(repo.settings['pull_requests']) def test_search_issues_milestones_invalid(self): - """ Test the search_issues of pagure.lib.query. """ + """ Test the search_issues of retrieval_queries. """ self.test_edit_issue() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.issues), 2) - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, milestones='foo') self.assertEqual(len(issues), 0) - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, milestones='foo', no_milestones=True) self.assertEqual(len(issues), 2) def test_search_issues_custom_search(self): - """ Test the search_issues of pagure.lib.query. """ + """ Test the search_issues of retrieval_queries. """ self.test_edit_issue() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.issues), 2) - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, custom_search={'foo': '*'}) self.assertEqual(len(issues), 0) def test_search_issues_offset(self): - """ Test the search_issues of pagure.lib.query. """ + """ Test the search_issues of retrieval_queries. """ self.test_edit_issue() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') - issues = pagure.lib.query.search_issues(self.session, repo) + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 2) self.assertEqual([i.id for i in issues], [2, 1]) - issues = pagure.lib.query.search_issues(self.session, repo, offset=1) + issues = retrieval_queries.search_issues(self.session, repo, offset=1) self.assertEqual(len(issues), 1) self.assertEqual([i.id for i in issues], [1]) def test_search_issues_tags(self): - """ Test the search_issues of pagure.lib.query. """ + """ Test the search_issues of retrieval_queries. """ self.test_edit_issue() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.issues), 2) # Add `tag1` to one issues and `tag2` only to the other one - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.query.add_tag_obj( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag1', @@ -2018,8 +2018,8 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Issue tagged with: tag1') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) - msg = pagure.lib.query.add_tag_obj( + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) + msg = retrieval_queries.add_tag_obj( session=self.session, obj=issue, tags='tag2', @@ -2029,14 +2029,14 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Issue tagged with: tag2') # Search all issues tagged with `tag1` - issues = pagure.lib.query.search_issues(self.session, repo, tags='tag1') + issues = retrieval_queries.search_issues(self.session, repo, tags='tag1') self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 1) self.assertEqual(issues[0].project_id, 1) self.assertEqual([tag.tag for tag in issues[0].tags], ['tag1']) # Search all issues *not* tagged with `tag1` - issues = pagure.lib.query.search_issues(self.session, repo, tags='!tag1') + issues = retrieval_queries.search_issues(self.session, repo, tags='!tag1') self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 2) self.assertEqual(issues[0].project_id, 1) @@ -2044,7 +2044,7 @@ class PagureLibtests(tests.Modeltests): [tag.tag for tag in issues[0].tags], ['tag2']) # Search all issues *not* tagged with `tag1` but tagged with `tag2` - issues = pagure.lib.query.search_issues( + issues = retrieval_queries.search_issues( self.session, repo, tags=['!tag1', 'tag2']) self.assertEqual(len(issues), 1) self.assertEqual(issues[0].id, 2) @@ -2053,41 +2053,41 @@ class PagureLibtests(tests.Modeltests): [tag.tag for tag in issues[0].tags], ['tag2']) def test_get_tags_of_project(self): - """ Test the get_tags_of_project of pagure.lib.query. """ + """ Test the get_tags_of_project of retrieval_queries. """ self.test_add_tag_obj() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], ['tag1']) - tags = pagure.lib.query.get_tags_of_project( + tags = retrieval_queries.get_tags_of_project( self.session, repo, pattern='T*') self.assertEqual([tag.tag for tag in tags], ['tag1']) - repo = pagure.lib.query._get_project(self.session, 'test2') + repo = retrieval_queries._get_project(self.session, 'test2') - tags = pagure.lib.query.get_tags_of_project(self.session, repo) + tags = retrieval_queries.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], []) def test_get_issue_statuses(self): - """ Test the get_issue_statuses of pagure.lib.query. """ - statuses = pagure.lib.query.get_issue_statuses(self.session) + """ Test the get_issue_statuses of retrieval_queries. """ + statuses = retrieval_queries.get_issue_statuses(self.session) self.assertEqual(sorted(statuses), ['Closed', 'Open']) @patch.dict(pagure.config.config, { 'ALLOWED_EMAIL_DOMAINS': ["fp.o"]}, clear=True) def test_set_up_user(self): - """ Test the set_up_user of pagure.lib.query. """ + """ Test the set_up_user of retrieval_queries. """ - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(2, len(items)) self.assertEqual(2, items[0].id) self.assertEqual('foo', items[0].user) self.assertEqual(1, items[1].id) self.assertEqual('pingou', items[1].user) - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=self.session, username='skvidal', fullname='Seth', @@ -2097,7 +2097,7 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) self.assertEqual(2, items[0].id) self.assertEqual('foo', items[0].user) @@ -2110,7 +2110,7 @@ class PagureLibtests(tests.Modeltests): ['skvidal@fp.o'], [email.email for email in items[2].emails]) # Add the user a second time - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=self.session, username='skvidal', fullname='Seth V', @@ -2119,7 +2119,7 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() # Nothing changed - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) self.assertEqual('skvidal', items[2].user) self.assertEqual('Seth V', items[2].fullname) @@ -2127,7 +2127,7 @@ class PagureLibtests(tests.Modeltests): ['skvidal@fp.o'], [email.email for email in items[2].emails]) # Add the user a third time with a different email - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=self.session, username='skvidal', fullname='Seth', @@ -2136,14 +2136,14 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() # Email added - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) self.assertEqual('skvidal', items[2].user) self.assertEqual( sorted(['skvidal@fp.o', 'svidal@fp.o']), sorted([email.email for email in items[2].emails])) # add again with forbidden email domain - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=self.session, username='skvidal', fullname='Seth', @@ -2152,7 +2152,7 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() # Email should not be added - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) self.assertEqual('skvidal', items[2].user) self.assertEqual( @@ -2165,14 +2165,14 @@ class PagureLibtests(tests.Modeltests): """ Test the set_up_user of pagure.lib when there are multimple domains configured in ALLOWED_EMAIL_DOMAINS""" - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(2, len(items)) self.assertEqual(2, items[0].id) self.assertEqual('foo', items[0].user) self.assertEqual(1, items[1].id) self.assertEqual('pingou', items[1].user) - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=self.session, username='skvidal', fullname='Seth', @@ -2182,7 +2182,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() # Add the user a second time with a different email - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=self.session, username='skvidal', fullname='Seth', @@ -2191,14 +2191,14 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() # Email added - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) self.assertEqual('skvidal', items[2].user) self.assertEqual( sorted(['skvidal@fp.o', 'skvidal@example.c']), sorted([email.email for email in items[2].emails])) # add again with forbidden email domain - pagure.lib.query.set_up_user( + retrieval_queries.set_up_user( session=self.session, username='skvidal', fullname='Seth', @@ -2207,7 +2207,7 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() # Email should not be added - items = pagure.lib.query.search_user(self.session) + items = retrieval_queries.search_user(self.session) self.assertEqual(3, len(items)) self.assertEqual('skvidal', items[2].user) self.assertEqual( @@ -2215,15 +2215,15 @@ class PagureLibtests(tests.Modeltests): sorted([email.email for email in items[2].emails])) def avatar_url_from_email(self): - """ Test the avatar_url_from_openid of pagure.lib.query. """ - output = pagure.lib.query.avatar_url_from_email('pingou@fedoraproject.org') + """ Test the avatar_url_from_openid of retrieval_queries. """ + output = retrieval_queries.avatar_url_from_email('pingou@fedoraproject.org') self.assertEqual( output, 'https://seccdn.libravatar.org/avatar/' 'b3ee7bb4de70b6522c2478df3b4cd6322b5ec5d62ac7ceb1128e3d4ff42f6928' '?s=64&d=retro') - output = pagure.lib.query.avatar_url_from_email('zoé@çëfò.org') + output = retrieval_queries.avatar_url_from_email('zoé@çëfò.org') self.assertEqual( output, 'https://seccdn.libravatar.org/avatar/' @@ -2231,18 +2231,18 @@ class PagureLibtests(tests.Modeltests): '?s=64&d=retro') def test_fork_project_with_branch(self): - """ Test the fork_project of pagure.lib.query. """ + """ Test the fork_project of retrieval_queries. """ gitfolder = os.path.join(self.path, 'repos') docfolder = os.path.join(gitfolder, 'docs') ticketfolder = os.path.join(gitfolder, 'tickets') requestfolder = os.path.join(gitfolder, 'requests') pagure.config.config['GIT_FOLDER'] = gitfolder - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) # Create a new project - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -2259,10 +2259,10 @@ class PagureLibtests(tests.Modeltests): 'repo': 'testproject', 'namespace': None}) - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 1) - project = pagure.lib.query._get_project(self.session, 'testproject') + project = retrieval_queries._get_project(self.session, 'testproject') gitrepo = os.path.join(gitfolder, project.path) docrepo = os.path.join(docfolder, project.path) ticketrepo = os.path.join(ticketfolder, project.path) @@ -2281,7 +2281,7 @@ class PagureLibtests(tests.Modeltests): # Fork - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=self.session, user='foo', repo=project, @@ -2294,10 +2294,10 @@ class PagureLibtests(tests.Modeltests): 'namespace': None, 'username': 'foo'}) - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 2) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( self.session, 'testproject', user='foo') # Check the branches of the fork self.assertEqual( @@ -2312,11 +2312,11 @@ class PagureLibtests(tests.Modeltests): ticketfolder = os.path.join(gitfolder, 'tickets') requestfolder = os.path.join(gitfolder, 'requests') - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 0) # Create a new project - task = pagure.lib.query.new_project( + task = retrieval_queries.new_project( session=self.session, user='pingou', name='testproject', @@ -2333,10 +2333,10 @@ class PagureLibtests(tests.Modeltests): 'repo': 'testproject', 'namespace': 'foonamespace'}) - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) self.assertEqual(len(projects), 1) - repo = pagure.lib.query._get_project(self.session, 'testproject', namespace='foonamespace') + repo = retrieval_queries._get_project(self.session, 'testproject', namespace='foonamespace') gitrepo = os.path.join(gitfolder, repo.path) docrepo = os.path.join(docfolder, repo.path) ticketrepo = os.path.join(ticketfolder, repo.path) @@ -2349,7 +2349,7 @@ class PagureLibtests(tests.Modeltests): # Fork worked - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=self.session, user='foo', repo=repo, @@ -2364,9 +2364,9 @@ class PagureLibtests(tests.Modeltests): # Fork a fork - repo = pagure.lib.query._get_project(self.session, 'testproject', user='foo', namespace='foonamespace') + repo = retrieval_queries._get_project(self.session, 'testproject', user='foo', namespace='foonamespace') - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=self.session, user='pingou', repo=repo, @@ -2381,7 +2381,7 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.notify.send_email') def test_new_pull_request(self, mockemail): - """ test new_pull_request of pagure.lib.query. """ + """ test new_pull_request of retrieval_queries. """ mockemail.return_value = True tests.create_projects(self.session) @@ -2399,10 +2399,10 @@ class PagureLibtests(tests.Modeltests): self.session.add(item) # Add an extra user to project `foo` - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_requests, 0) - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -2411,14 +2411,14 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User added') - repo = pagure.lib.query._get_project(self.session, 'test') - forked_repo = pagure.lib.query._get_project( + repo = retrieval_queries._get_project(self.session, 'test') + forked_repo = retrieval_queries._get_project( self.session, 'test', user='pingou') # Fails for the lack of repo_from and remote_git self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.new_pull_request, + retrieval_queries.new_pull_request, session=self.session, repo_from=None, branch_from='master', @@ -2429,7 +2429,7 @@ class PagureLibtests(tests.Modeltests): ) # Let's pretend we turned on the CI hook for the project - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') obj = pagure.hooks.pagure_ci.PagureCITable( project_id=project.id, active=True @@ -2438,7 +2438,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() # Create the new PR - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -2452,17 +2452,17 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(req.title, 'test pull-request') self.assertEqual(repo.open_requests, 1) - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_add_pull_request_comment(self, mock_redis): - """ Test add_pull_request_comment of pagure.lib.query. """ + """ Test add_pull_request_comment of retrieval_queries. """ mock_redis.return_value = True self.test_new_pull_request() - request = pagure.lib.query.search_pull_requests(self.session, requestid=1) + request = retrieval_queries.search_pull_requests(self.session, requestid=1) - msg = pagure.lib.query.add_pull_request_comment( + msg = retrieval_queries.add_pull_request_comment( session=self.session, request=request, commit='commithash', @@ -2481,18 +2481,18 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(request.score, 0) self.assertEqual(mock_redis.publish.call_count, 1) - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) - @patch('pagure.lib.query.PAGURE_CI', MagicMock(return_value=True)) + @patch('retrieval_queries.PAGURE_CI', MagicMock(return_value=True)) def test_add_pull_request_comment_to_re_run_ci(self, mock_redis): - """ Test add_pull_request_comment of pagure.lib.query. """ + """ Test add_pull_request_comment of retrieval_queries. """ mock_redis.return_value = True self.test_new_pull_request() self.assertEqual(mock_redis.publish.call_count, 0) # Let's pretend we turned on the CI hook for the project - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') if not project.ci_hook or not project.ci_hook.active: obj = pagure.hooks.pagure_ci.PagureCITable( project_id=project.id, @@ -2501,8 +2501,8 @@ class PagureLibtests(tests.Modeltests): self.session.add(obj) self.session.commit() - request = pagure.lib.query.search_pull_requests(self.session, requestid=1) - msg = pagure.lib.query.add_pull_request_comment( + request = retrieval_queries.search_pull_requests(self.session, requestid=1) + msg = retrieval_queries.add_pull_request_comment( session=self.session, request=request, commit='commithash', @@ -2524,16 +2524,16 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.notify.send_email') def test_add_pull_request_flag(self, mockemail): - """ Test add_pull_request_flag of pagure.lib.query. """ + """ Test add_pull_request_flag of retrieval_queries. """ mockemail.return_value = True self.test_new_pull_request() tests.create_tokens(self.session) - request = pagure.lib.query.search_pull_requests(self.session, requestid=1) + request = retrieval_queries.search_pull_requests(self.session, requestid=1) self.assertEqual(len(request.flags), 0) - msg = pagure.lib.query.add_pull_request_flag( + msg = retrieval_queries.add_pull_request_flag( session=self.session, request=request, username="jenkins", @@ -2553,35 +2553,35 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_search_pull_requests(self): - """ Test search_pull_requests of pagure.lib.query. """ + """ Test search_pull_requests of retrieval_queries. """ self.test_new_pull_request() - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session ) self.assertEqual(len(prs), 1) - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, project_id=1 ) self.assertEqual(len(prs), 1) - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, project_id_from=4 ) self.assertEqual(len(prs), 1) - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, status=False ) self.assertEqual(len(prs), 0) # All non-assigned PR - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, assignee=False ) @@ -2592,35 +2592,35 @@ class PagureLibtests(tests.Modeltests): self.session.commit() # All the PR assigned - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, assignee=True ) self.assertEqual(len(prs), 1) # Basically the same as above but then for a specific user - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, assignee='pingou' ) self.assertEqual(len(prs), 1) # All PR except those assigned to pingou - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, assignee='!pingou' ) self.assertEqual(len(prs), 0) # All PR created by the specified author - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, author='pingou' ) self.assertEqual(len(prs), 1) # Count the PR instead of listing them - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, author='pingou', count=True @@ -2630,8 +2630,8 @@ class PagureLibtests(tests.Modeltests): dt = datetime.datetime.utcnow() # Create the second PR - repo = pagure.lib.query._get_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -2646,14 +2646,14 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(repo.open_requests, 2) # Ensure we have 2 PRs - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, author='pingou', ) self.assertEqual(len(prs), 2) # Test the offset - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, author='pingou', offset=1, @@ -2663,7 +2663,7 @@ class PagureLibtests(tests.Modeltests): # Test the updated_after # Test updated after before the second PR was created - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, author='pingou', updated_after=dt, @@ -2671,7 +2671,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(prs), 1) # Test updated after, 1h ago - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, author='pingou', updated_after=dt - datetime.timedelta(hours=1), @@ -2680,26 +2680,26 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.notify.send_email') def test_close_pull_request(self, send_email): - """ Test close_pull_request of pagure.lib.query. """ + """ Test close_pull_request of retrieval_queries. """ send_email.return_value = True self.test_new_pull_request() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_requests, 1) - request = pagure.lib.query.search_pull_requests(self.session, requestid=1) + request = retrieval_queries.search_pull_requests(self.session, requestid=1) - pagure.lib.query.close_pull_request( + retrieval_queries.close_pull_request( session=self.session, request=request, user='pingou', merged=True, ) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(repo.open_requests, 0) - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, status=False ) @@ -2707,7 +2707,7 @@ class PagureLibtests(tests.Modeltests): # Does not change much, just the notification sent - pagure.lib.query.close_pull_request( + retrieval_queries.close_pull_request( session=self.session, request=request, user='pingou', @@ -2715,22 +2715,22 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() - prs = pagure.lib.query.search_pull_requests( + prs = retrieval_queries.search_pull_requests( session=self.session, status=False ) self.assertEqual(len(prs), 1) - @patch('pagure.lib.query.REDIS', MagicMock(return_value=True)) + @patch('retrieval_queries.REDIS', MagicMock(return_value=True)) @patch('pagure.lib.git.update_git', MagicMock(return_value=True)) @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_remove_issue_dependency(self): - """ Test remove_issue_dependency of pagure.lib.query. """ + """ Test remove_issue_dependency of retrieval_queries. """ self.test_add_issue_dependency() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - issue_blocked = pagure.lib.query.search_issues( + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + issue_blocked = retrieval_queries.search_issues( self.session, repo, issueid=2) # Before @@ -2746,7 +2746,7 @@ class PagureLibtests(tests.Modeltests): self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.remove_issue_dependency, + retrieval_queries.remove_issue_dependency, session=self.session, issue=issue, issue_blocked=issue, @@ -2754,7 +2754,7 @@ class PagureLibtests(tests.Modeltests): ) # Wrong order of issues - msg = pagure.lib.query.remove_issue_dependency( + msg = retrieval_queries.remove_issue_dependency( session=self.session, issue=issue, issue_blocked=issue_blocked, @@ -2764,7 +2764,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, None) # Drop deps - msg = pagure.lib.query.remove_issue_dependency( + msg = retrieval_queries.remove_issue_dependency( session=self.session, issue=issue_blocked, issue_blocked=issue, @@ -2782,72 +2782,72 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_get_issue_comment(self, p_send_email, p_ugt): - """ Test the get_issue_comment of pagure.lib.query. """ + """ Test the get_issue_comment of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_add_issue_comment() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( - pagure.lib.query.get_issue_comment(self.session, issue.uid, 10), + retrieval_queries.get_issue_comment(self.session, issue.uid, 10), None ) - comment = pagure.lib.query.get_issue_comment(self.session, issue.uid, 1) + comment = retrieval_queries.get_issue_comment(self.session, issue.uid, 1) self.assertEqual(comment.comment, 'Hey look a comment!') @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_get_issue_by_uid(self, p_send_email, p_ugt): - """ Test the get_issue_by_uid of pagure.lib.query. """ + """ Test the get_issue_by_uid of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( - pagure.lib.query.get_issue_by_uid(self.session, 'foobar'), + retrieval_queries.get_issue_by_uid(self.session, 'foobar'), None ) - new_issue = pagure.lib.query.get_issue_by_uid(self.session, issue.uid) + new_issue = retrieval_queries.get_issue_by_uid(self.session, issue.uid) self.assertEqual(issue, new_issue) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_update_tags(self, p_send_email, p_ugt): - """ Test the update_tags of pagure.lib.query. """ + """ Test the update_tags of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) # before self.assertEqual(repo.tags_colored, []) self.assertEqual(issue.tags_text, []) - messages = pagure.lib.query.update_tags( + messages = retrieval_queries.update_tags( self.session, issue, 'tag', 'pingou') self.assertEqual(messages, ['Issue tagged with: tag']) # after - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( [t.tag for t in repo.tags_colored], ['tag']) self.assertEqual(issue.tags_text, ['tag']) # Replace the tag by two others - messages = pagure.lib.query.update_tags( + messages = retrieval_queries.update_tags( self.session, issue, ['tag2', 'tag3'], 'pingou') self.assertEqual( messages, [ @@ -2857,8 +2857,8 @@ class PagureLibtests(tests.Modeltests): ) # after - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( sorted([t.tag for t in repo.tags_colored]), @@ -2869,19 +2869,19 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_update_dependency_issue(self, p_send_email, p_ugt): - """ Test the update_dependency_issue of pagure.lib.query. """ + """ Test the update_dependency_issue of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual(repo.open_tickets, 2) self.assertEqual(repo.open_tickets_public, 2) # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #3', @@ -2900,10 +2900,10 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, []) - messages = pagure.lib.query.update_dependency_issue( + messages = retrieval_queries.update_dependency_issue( self.session, repo, issue, '2', 'pingou') self.assertEqual(messages, ['Issue marked as depending on: #2']) - messages = pagure.lib.query.update_dependency_issue( + messages = retrieval_queries.update_dependency_issue( self.session, repo, issue, ['3', '4', 5], 'pingou') self.assertEqual( messages, @@ -2923,16 +2923,16 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') def test_update_blocked_issue(self, p_send_email, p_ugt): - """ Test the update_blocked_issue of pagure.lib.query. """ + """ Test the update_blocked_issue of retrieval_queries. """ p_send_email.return_value = True p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.query._get_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries._get_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) # Create issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #3', @@ -2948,10 +2948,10 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, []) - messages = pagure.lib.query.update_blocked_issue( + messages = retrieval_queries.update_blocked_issue( self.session, repo, issue, '2', 'pingou') self.assertEqual(messages, ['Issue marked as blocking: #2']) - messages = pagure.lib.query.update_blocked_issue( + messages = retrieval_queries.update_blocked_issue( self.session, repo, issue, ['3', '4', 5], 'pingou') self.assertEqual( messages, [ @@ -2967,16 +2967,16 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.notify.send_email') def test_add_pull_request_assignee(self, mockemail): - """ Test add_pull_request_assignee of pagure.lib.query. """ + """ Test add_pull_request_assignee of retrieval_queries. """ mockemail.return_value = True self.test_new_pull_request() - request = pagure.lib.query.search_pull_requests(self.session, requestid=1) + request = retrieval_queries.search_pull_requests(self.session, requestid=1) self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_pull_request_assignee, + retrieval_queries.add_pull_request_assignee, session=self.session, request=request, assignee='bar', @@ -2984,7 +2984,7 @@ class PagureLibtests(tests.Modeltests): ) # Assign - msg = pagure.lib.query.add_pull_request_assignee( + msg = retrieval_queries.add_pull_request_assignee( session=self.session, request=request, assignee='pingou', @@ -2993,7 +2993,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Request assigned') # Reset - msg = pagure.lib.query.add_pull_request_assignee( + msg = retrieval_queries.add_pull_request_assignee( session=self.session, request=request, assignee=None, @@ -3002,7 +3002,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Request reset') # Try resetting again - msg = pagure.lib.query.add_pull_request_assignee( + msg = retrieval_queries.add_pull_request_assignee( session=self.session, request=request, assignee=None, @@ -3011,12 +3011,12 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, None) def test_search_pending_email(self): - """ Test search_pending_email of pagure.lib.query. """ + """ Test search_pending_email of retrieval_queries. """ self.assertEqual( - pagure.lib.query.search_pending_email(self.session), None) + retrieval_queries.search_pending_email(self.session), None) - user = pagure.lib.query.search_user(self.session, username='pingou') + user = retrieval_queries.search_user(self.session, username='pingou') email_pend = pagure.lib.model.UserEmailPending( user_id=user.id, @@ -3027,33 +3027,33 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertNotEqual( - pagure.lib.query.search_pending_email(self.session), None) + retrieval_queries.search_pending_email(self.session), None) self.assertNotEqual( - pagure.lib.query.search_pending_email(self.session, token='abcdef'), + retrieval_queries.search_pending_email(self.session, token='abcdef'), None) - pend = pagure.lib.query.search_pending_email(self.session, token='abcdef') + pend = retrieval_queries.search_pending_email(self.session, token='abcdef') self.assertEqual(pend.user.username, 'pingou') self.assertEqual(pend.email, 'foo@fp.o') self.assertEqual(pend.token, 'abcdef') - pend = pagure.lib.query.search_pending_email(self.session, email='foo@fp.o') + pend = retrieval_queries.search_pending_email(self.session, email='foo@fp.o') self.assertEqual(pend.user.username, 'pingou') self.assertEqual(pend.email, 'foo@fp.o') self.assertEqual(pend.token, 'abcdef') def test_generate_hook_token(self): - """ Test generate_hook_token of pagure.lib.query. """ + """ Test generate_hook_token of retrieval_queries. """ tests.create_projects(self.session) - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) for proj in projects: self.assertIn(proj.hook_token, ['aaabbbccc', 'aaabbbddd', 'aaabbbeee']) - pagure.lib.query.generate_hook_token(self.session) + retrieval_queries.generate_hook_token(self.session) - projects = pagure.lib.query.search_projects(self.session) + projects = retrieval_queries.search_projects(self.session) for proj in projects: self.assertNotIn(proj.hook_token, ['aaabbbccc', 'aaabbbddd', 'aaabbbeee']) @@ -3064,9 +3064,9 @@ class PagureLibtests(tests.Modeltests): self.test_new_pull_request() - request = pagure.lib.query.search_pull_requests(self.session, requestid=1) + request = retrieval_queries.search_pull_requests(self.session, requestid=1) - msg = pagure.lib.query.add_pull_request_comment( + msg = retrieval_queries.add_pull_request_comment( session=self.session, request=request, commit=None, @@ -3079,7 +3079,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Comment added') - msg = pagure.lib.query.add_pull_request_comment( + msg = retrieval_queries.add_pull_request_comment( session=self.session, request=request, commit=None, @@ -3092,7 +3092,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Comment added') - msg = pagure.lib.query.add_pull_request_comment( + msg = retrieval_queries.add_pull_request_comment( session=self.session, request=request, commit=None, @@ -3109,15 +3109,15 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(request.score, 1) def test_add_group(self): - """ Test the add_group method of pagure.lib.query. """ - groups = pagure.lib.query.search_groups(self.session) + """ Test the add_group method of retrieval_queries. """ + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) self.assertEqual(groups, []) # Invalid type self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group, + retrieval_queries.add_group, self.session, group_name='foo', display_name='foo group', @@ -3127,14 +3127,14 @@ class PagureLibtests(tests.Modeltests): is_admin=True, blacklist=[], ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) self.assertEqual(groups, []) # Invalid user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group, + retrieval_queries.add_group, self.session, group_name='foo', display_name='foo group', @@ -3144,14 +3144,14 @@ class PagureLibtests(tests.Modeltests): is_admin=False, blacklist=[], ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) self.assertEqual(groups, []) # Invalid group name self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group, + retrieval_queries.add_group, self.session, group_name='foo group', display_name='foo group', @@ -3161,11 +3161,11 @@ class PagureLibtests(tests.Modeltests): is_admin=False, blacklist=[], ) - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 0) self.assertEqual(groups, []) - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='foo', display_name='foo group', @@ -3178,14 +3178,14 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User `pingou` added to the group `foo`.') - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 1) self.assertEqual(groups[0].group_name, 'foo') # Group with this name already exists self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group, + retrieval_queries.add_group, self.session, group_name='foo', display_name='foo group', @@ -3199,7 +3199,7 @@ class PagureLibtests(tests.Modeltests): # Group with this display name already exists self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group, + retrieval_queries.add_group, self.session, group_name='foo1', display_name='foo group', @@ -3213,7 +3213,7 @@ class PagureLibtests(tests.Modeltests): # Group with a blacklisted prefix self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group, + retrieval_queries.add_group, self.session, group_name='forks', display_name='foo group', @@ -3225,16 +3225,16 @@ class PagureLibtests(tests.Modeltests): ) def test_add_user_to_group(self): - """ Test the add_user_to_group method of pagure.lib.query. """ + """ Test the add_user_to_group method of retrieval_queries. """ self.test_add_group() - group = pagure.lib.query.search_groups(self.session, group_name='foo') + group = retrieval_queries.search_groups(self.session, group_name='foo') self.assertNotEqual(group, None) self.assertEqual(group.group_name, 'foo') # Invalid new user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_group, + retrieval_queries.add_user_to_group, self.session, username='foobar', group=group, @@ -3245,7 +3245,7 @@ class PagureLibtests(tests.Modeltests): # Invalid user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_group, + retrieval_queries.add_user_to_group, self.session, username='foo', group=group, @@ -3256,7 +3256,7 @@ class PagureLibtests(tests.Modeltests): # User not allowed self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_group, + retrieval_queries.add_user_to_group, self.session, username='foo', group=group, @@ -3264,7 +3264,7 @@ class PagureLibtests(tests.Modeltests): is_admin=False, ) - msg = pagure.lib.query.add_user_to_group( + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -3274,7 +3274,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User `foo` added to the group `foo`.') - msg = pagure.lib.query.add_user_to_group( + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -3286,56 +3286,56 @@ class PagureLibtests(tests.Modeltests): msg, 'User `foo` already in the group, nothing to change.') def test_is_group_member(self): - """ Test the is_group_member method of pagure.lib.query. """ + """ Test the is_group_member method of retrieval_queries. """ self.test_add_group() self.assertFalse( - pagure.lib.query.is_group_member(self.session, None, 'foo')) + retrieval_queries.is_group_member(self.session, None, 'foo')) self.assertFalse( - pagure.lib.query.is_group_member(self.session, 'bar', 'foo')) + retrieval_queries.is_group_member(self.session, 'bar', 'foo')) self.assertFalse( - pagure.lib.query.is_group_member(self.session, 'foo', 'foo')) + retrieval_queries.is_group_member(self.session, 'foo', 'foo')) self.assertTrue( - pagure.lib.query.is_group_member(self.session, 'pingou', 'foo')) + retrieval_queries.is_group_member(self.session, 'pingou', 'foo')) def test_get_user_group(self): - """ Test the get_user_group method of pagure.lib.query. """ + """ Test the get_user_group method of retrieval_queries. """ self.test_add_group() - item = pagure.lib.query.get_user_group(self.session, 1, 1) + item = retrieval_queries.get_user_group(self.session, 1, 1) self.assertEqual(item.user_id, 1) self.assertEqual(item.group_id, 1) - item = pagure.lib.query.get_user_group(self.session, 1, 2) + item = retrieval_queries.get_user_group(self.session, 1, 2) self.assertEqual(item, None) - item = pagure.lib.query.get_user_group(self.session, 2, 1) + item = retrieval_queries.get_user_group(self.session, 2, 1) self.assertEqual(item, None) def test_get_group_types(self): - """ Test the get_group_types method of pagure.lib.query. """ + """ Test the get_group_types method of retrieval_queries. """ self.test_add_group() - groups = pagure.lib.query.get_group_types(self.session, 'user') + groups = retrieval_queries.get_group_types(self.session, 'user') self.assertEqual(len(groups), 1) self.assertEqual(groups[0].group_type, 'user') - groups = pagure.lib.query.get_group_types(self.session) + groups = retrieval_queries.get_group_types(self.session) self.assertEqual(len(groups), 2) self.assertEqual(groups[0].group_type, 'admin') self.assertEqual(groups[1].group_type, 'user') def test_search_groups(self): - """ Test the search_groups method of pagure.lib.query. """ + """ Test the search_groups method of retrieval_queries. """ - self.assertEqual(pagure.lib.query.search_groups(self.session), []) + self.assertEqual(retrieval_queries.search_groups(self.session), []) - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='foo', display_name='foo group', @@ -3348,11 +3348,11 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User `pingou` added to the group `foo`.') - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 1) self.assertEqual(groups[0].group_name, 'foo') - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='bar', display_name='bar group', @@ -3365,34 +3365,34 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User `pingou` added to the group `bar`.') - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 2) self.assertEqual(groups[0].group_name, 'bar') self.assertEqual(groups[1].group_name, 'foo') - groups = pagure.lib.query.search_groups(self.session, group_type='user') + groups = retrieval_queries.search_groups(self.session, group_type='user') self.assertEqual(len(groups), 1) self.assertEqual(groups[0].group_name, 'foo') - groups = pagure.lib.query.search_groups(self.session, group_type='admin') + groups = retrieval_queries.search_groups(self.session, group_type='admin') self.assertEqual(len(groups), 1) self.assertEqual(groups[0].group_name, 'bar') - groups = pagure.lib.query.search_groups(self.session, group_name='foo') + groups = retrieval_queries.search_groups(self.session, group_name='foo') self.assertEqual(groups.group_name, 'foo') def test_delete_user_of_group(self): - """ Test the delete_user_of_group method of pagure.lib.query. """ + """ Test the delete_user_of_group method of retrieval_queries. """ self.test_add_user_to_group() - groups = pagure.lib.query.search_groups(self.session) + groups = retrieval_queries.search_groups(self.session) self.assertEqual(len(groups), 1) self.assertEqual(groups[0].group_name, 'foo') # Invalid username self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.delete_user_of_group, + retrieval_queries.delete_user_of_group, self.session, username='bar', groupname='foo', @@ -3403,7 +3403,7 @@ class PagureLibtests(tests.Modeltests): # Invalid groupname self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.delete_user_of_group, + retrieval_queries.delete_user_of_group, self.session, username='foo', groupname='bar', @@ -3414,7 +3414,7 @@ class PagureLibtests(tests.Modeltests): # Invalid user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.delete_user_of_group, + retrieval_queries.delete_user_of_group, self.session, username='foo', groupname='foo', @@ -3438,7 +3438,7 @@ class PagureLibtests(tests.Modeltests): self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.delete_user_of_group, + retrieval_queries.delete_user_of_group, self.session, username='bar', groupname='foo', @@ -3449,7 +3449,7 @@ class PagureLibtests(tests.Modeltests): # User is not allowed to remove the username self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.delete_user_of_group, + retrieval_queries.delete_user_of_group, self.session, username='foo', groupname='foo', @@ -3460,7 +3460,7 @@ class PagureLibtests(tests.Modeltests): # Username is the creator of the group self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.delete_user_of_group, + retrieval_queries.delete_user_of_group, self.session, username='pingou', groupname='foo', @@ -3469,10 +3469,10 @@ class PagureLibtests(tests.Modeltests): ) # All good - group = pagure.lib.query.search_groups(self.session, group_name='foo') + group = retrieval_queries.search_groups(self.session, group_name='foo') self.assertEqual(len(group.users), 2) - pagure.lib.query.delete_user_of_group( + retrieval_queries.delete_user_of_group( self.session, username='foo', groupname='foo', @@ -3481,20 +3481,20 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() - group = pagure.lib.query.search_groups(self.session, group_name='foo') + group = retrieval_queries.search_groups(self.session, group_name='foo') self.assertEqual(len(group.users), 1) def test_edit_group_info(self): - """ Test the edit_group_info method of pagure.lib.query. """ + """ Test the edit_group_info method of retrieval_queries. """ self.test_add_group() - group = pagure.lib.query.search_groups(self.session, group_name='foo') + group = retrieval_queries.search_groups(self.session, group_name='foo') self.assertNotEqual(group, None) self.assertEqual(group.group_name, 'foo') # Invalid new user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.edit_group_info, + retrieval_queries.edit_group_info, self.session, group=group, display_name='edited name', @@ -3506,7 +3506,7 @@ class PagureLibtests(tests.Modeltests): # Invalid user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.edit_group_info, + retrieval_queries.edit_group_info, self.session, group=group, display_name='edited name', @@ -3518,7 +3518,7 @@ class PagureLibtests(tests.Modeltests): # User not allowed self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.edit_group_info, + retrieval_queries.edit_group_info, self.session, group=group, display_name='edited name', @@ -3527,7 +3527,7 @@ class PagureLibtests(tests.Modeltests): is_admin=False, ) - msg = pagure.lib.query.edit_group_info( + msg = retrieval_queries.edit_group_info( self.session, group=group, display_name='edited name', @@ -3538,7 +3538,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Group "edited name" (foo) edited') - msg = pagure.lib.query.edit_group_info( + msg = retrieval_queries.edit_group_info( self.session, group=group, display_name='edited name', @@ -3550,16 +3550,16 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Nothing changed') def test_add_group_to_project(self): - """ Test the add_group_to_project method of pagure.lib.query. """ + """ Test the add_group_to_project method of retrieval_queries. """ tests.create_projects(self.session) self.test_add_group() - project = pagure.lib.query._get_project(self.session, 'test2') + project = retrieval_queries._get_project(self.session, 'test2') # Group does not exist self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group_to_project, + retrieval_queries.add_group_to_project, session=self.session, project=project, new_group='bar', @@ -3567,7 +3567,7 @@ class PagureLibtests(tests.Modeltests): ) # Group does not exist, but allow creating it - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='bar', @@ -3583,7 +3583,7 @@ class PagureLibtests(tests.Modeltests): # User does not exist self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group_to_project, + retrieval_queries.add_group_to_project, session=self.session, project=project, new_group='foo', @@ -3593,7 +3593,7 @@ class PagureLibtests(tests.Modeltests): # User not allowed self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group_to_project, + retrieval_queries.add_group_to_project, session=self.session, project=project, new_group='foo', @@ -3601,7 +3601,7 @@ class PagureLibtests(tests.Modeltests): ) # All good - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='foo', @@ -3619,7 +3619,7 @@ class PagureLibtests(tests.Modeltests): # Group already associated with the project self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_group_to_project, + retrieval_queries.add_group_to_project, session=self.session, project=project, new_group='foo', @@ -3627,7 +3627,7 @@ class PagureLibtests(tests.Modeltests): ) # Update the access of group in the project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='foo', @@ -3643,7 +3643,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(project.committer_groups), 2) # Update the access of group in the project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='foo', @@ -3660,15 +3660,15 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(project.committer_groups[0].group_name, 'bar') def test_update_watch_status(self): - """ Test the update_watch_status method of pagure.lib.query. """ + """ Test the update_watch_status method of retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') # User does not exist self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.update_watch_status, + retrieval_queries.update_watch_status, session=self.session, project=project, user='aavrug', @@ -3678,7 +3678,7 @@ class PagureLibtests(tests.Modeltests): # Invalid watch status self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.update_watch_status, + retrieval_queries.update_watch_status, session=self.session, project=project, user='pingou', @@ -3686,7 +3686,7 @@ class PagureLibtests(tests.Modeltests): ) # All good and when user selected reset watch option. - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3696,7 +3696,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Watch status is already reset') # All good and when user selected watch issues option. - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3707,7 +3707,7 @@ class PagureLibtests(tests.Modeltests): msg, 'You are now watching issues and PRs on this project') # All good and when user selected unwatch option. - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3717,7 +3717,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'You are no longer watching this project') # All good and when user seleted reset watch option. - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3727,11 +3727,11 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Watch status reset') def test_get_watch_level_on_repo_invalid(self): - """ test the get_watch_level_on_repo method of pagure.lib.query. """ + """ test the get_watch_level_on_repo method of retrieval_queries. """ self.assertRaises( RuntimeError, - pagure.lib.query.get_watch_level_on_repo, + retrieval_queries.get_watch_level_on_repo, session=self.session, user='pingou', repo=None, @@ -3740,15 +3740,15 @@ class PagureLibtests(tests.Modeltests): ) def test_get_watch_level_on_repo(self): - """ Test the get_watch_level_on_repo method of pagure.lib.query. """ + """ Test the get_watch_level_on_repo method of retrieval_queries. """ tests.create_projects(self.session) self.test_add_group() - project = pagure.lib.query._get_project(self.session, 'test') - project2 = pagure.lib.query._get_project(self.session, 'test2') + project = retrieval_queries._get_project(self.session, 'test') + project2 = retrieval_queries._get_project(self.session, 'test2') # If user not logged in - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=None, repo='test', @@ -3758,7 +3758,7 @@ class PagureLibtests(tests.Modeltests): # User does not exist user = tests.FakeUser() user.username = 'aavrug' - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3766,14 +3766,14 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(watch_level, []) # Invalid project - watch = pagure.lib.query.get_watch_level_on_repo( + watch = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='invalid', ) self.assertFalse(watch) - pagure.lib.query.add_group_to_project( + retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='foo', @@ -3781,8 +3781,8 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() - group = pagure.lib.query.search_groups(self.session, group_name='foo') - pagure.lib.query.add_user_to_group( + group = retrieval_queries.search_groups(self.session, group_name='foo') + retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -3790,11 +3790,11 @@ class PagureLibtests(tests.Modeltests): is_admin=False, ) self.session.commit() - group = pagure.lib.query.search_groups(self.session, group_name='foo') + group = retrieval_queries.search_groups(self.session, group_name='foo') # If user belongs to any group of that project user.username = 'foo' - msg = watch_level = pagure.lib.query.get_watch_level_on_repo( + msg = watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3803,7 +3803,7 @@ class PagureLibtests(tests.Modeltests): # If user is the creator user.username = 'pingou' - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3811,7 +3811,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(watch_level, ['issues']) # Entry into watchers table for issues and commits - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3823,7 +3823,7 @@ class PagureLibtests(tests.Modeltests): 'You are now watching issues, PRs, and commits on this project') # From watchers table - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3832,7 +3832,7 @@ class PagureLibtests(tests.Modeltests): # Make sure that when a user watches more than one repo explicitly # they get the correct watch status - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project2, user='pingou', @@ -3844,7 +3844,7 @@ class PagureLibtests(tests.Modeltests): 'You are now watching issues and PRs on this project') # From watchers table - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test2', @@ -3852,7 +3852,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(['issues'], watch_level) # Entry into watchers table for just commits - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3863,7 +3863,7 @@ class PagureLibtests(tests.Modeltests): msg, 'You are now watching commits on this project') # From watchers table - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3871,7 +3871,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(['commits'], watch_level) # Entry into watchers table for issues - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3882,7 +3882,7 @@ class PagureLibtests(tests.Modeltests): msg, 'You are now watching issues and PRs on this project') # From watchers table - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3890,7 +3890,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(['issues'], watch_level) # Entry into watchers table for no watching - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3900,7 +3900,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'You are no longer watching this project') # From watchers table - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3919,7 +3919,7 @@ class PagureLibtests(tests.Modeltests): user_id=3, email='bar@bar.com') self.session.add(item) - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=project, new_user='bar', @@ -3930,7 +3930,7 @@ class PagureLibtests(tests.Modeltests): # Check if the new contributor is watching user.username = 'bar' - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3939,7 +3939,7 @@ class PagureLibtests(tests.Modeltests): # wrong project user.username = 'bar' - watch_level = pagure.lib.query.get_watch_level_on_repo( + watch_level = retrieval_queries.get_watch_level_on_repo( session=self.session, user=user, repo='test', @@ -3955,7 +3955,7 @@ class PagureLibtests(tests.Modeltests): # He should be watching user = tests.FakeUser() user.username = 'pingou' - watch_list_objs = pagure.lib.query.user_watch_list( + watch_list_objs = retrieval_queries.user_watch_list( session=self.session, user='pingou', ) @@ -3963,9 +3963,9 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(watch_list, ['test', 'test2', 'test3']) # Make pingou unwatch the test3 project - project =pagure.lib.query._get_project( + project =retrieval_queries._get_project( self.session, 'test3', namespace='somenamespace') - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -3975,7 +3975,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'You are no longer watching this project') # Re-check the watch list - watch_list_objs = pagure.lib.query.user_watch_list( + watch_list_objs = retrieval_queries.user_watch_list( session=self.session, user='pingou', ) @@ -3984,7 +3984,7 @@ class PagureLibtests(tests.Modeltests): # He isn't in the db, thus not watching anything user.username = 'vivek' - watch_list_objs = pagure.lib.query.user_watch_list( + watch_list_objs = retrieval_queries.user_watch_list( session=self.session, user='vivek', ) @@ -3993,7 +3993,7 @@ class PagureLibtests(tests.Modeltests): # He shouldn't be watching anything user.username = 'foo' - watch_list_objs = pagure.lib.query.user_watch_list( + watch_list_objs = retrieval_queries.user_watch_list( session=self.session, user='foo', ) @@ -4007,7 +4007,7 @@ class PagureLibtests(tests.Modeltests): @patch('flask.g') @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_text2markdown(self, g, req, reqget): - ''' Test the test2markdown method in pagure.lib.query. ''' + ''' Test the test2markdown method in retrieval_queries. ''' pagure.config.config['TESTING'] = True pagure.config.config['SERVER_NAME'] = 'localhost.localdomain' @@ -4018,8 +4018,8 @@ class PagureLibtests(tests.Modeltests): self.test_new_pull_request() # create an issue (will be #2) in 'test' project - repo = pagure.lib.query._get_project(self.session, 'test') - iss = pagure.lib.query.new_issue( + repo = retrieval_queries._get_project(self.session, 'test') + iss = retrieval_queries.new_issue( issue_id=2, session=self.session, repo=repo, @@ -4032,8 +4032,8 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') # create PR#2 to project pingou/test - forked_repo = pagure.lib.query._get_project(self.session, 'test', user='pingou') - req = pagure.lib.query.new_pull_request( + forked_repo = retrieval_queries._get_project(self.session, 'test', user='pingou') + req = retrieval_queries.new_pull_request( requestid=2, session=self.session, repo_from=forked_repo, @@ -4059,7 +4059,7 @@ class PagureLibtests(tests.Modeltests): self.session.add(item) self.session.commit() - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=item, @@ -4084,7 +4084,7 @@ class PagureLibtests(tests.Modeltests): self.session.add(item) self.session.commit() - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=7, session=self.session, repo=item, @@ -4096,7 +4096,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(iss.id, 7) self.assertEqual(iss.title, 'test issue #7') - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=8, session=self.session, repo=item, @@ -4261,31 +4261,31 @@ class PagureLibtests(tests.Modeltests): with self.app.application.app_context(): g.session = self.session for idx, text in enumerate(texts): - html = pagure.lib.query.text2markdown(text) + html = retrieval_queries.text2markdown(text) self.assertEqual(html, expected[idx]) def test_text2markdown_exception(self): - ''' Test the test2markdown method in pagure.lib.query. ''' + ''' Test the test2markdown method in retrieval_queries. ''' text = 'test#1 bazinga!' expected_html = 'test#1 bazinga!' - html = pagure.lib.query.text2markdown(text) + html = retrieval_queries.text2markdown(text) self.assertEqual(html, expected_html) def test_text2markdown_empty_string(self): - ''' Test the test2markdown method in pagure.lib.query. ''' + ''' Test the test2markdown method in retrieval_queries. ''' text = '' expected_html = '' - html = pagure.lib.query.text2markdown(text) + html = retrieval_queries.text2markdown(text) self.assertEqual(html, expected_html) def test_get_access_levels(self): ''' Test the get_access_levels method in pagure.lib ''' - acls = pagure.lib.query.get_access_levels(self.session) + acls = retrieval_queries.get_access_levels(self.session) self.assertEqual( sorted(['admin', 'commit', 'ticket']), sorted(acls) @@ -4296,7 +4296,7 @@ class PagureLibtests(tests.Modeltests): ''' tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # Default value of combine is True # which means the an admin is a user, committer as well @@ -4321,7 +4321,7 @@ class PagureLibtests(tests.Modeltests): # Let's add a new user to the project, 'foo' # By default, if no access is specified, he becomes an admin - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4331,7 +4331,7 @@ class PagureLibtests(tests.Modeltests): # since, he is an admin, the msg should be 'User added' self.assertEqual(msg, 'User added') - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') users = project.get_project_users(access='admin') self.assertEqual(len(users), 1) @@ -4350,7 +4350,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(users[0].username, 'foo') # let's update the access of foo to 'committer' - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4360,7 +4360,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User access updated') - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # No admin now, even though pingou the creator is there users = project.get_project_users(access='admin') self.assertEqual(len(users), 0) @@ -4377,7 +4377,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(users[0].username, 'foo') # let's update the access of foo to 'ticket' - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4387,7 +4387,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User access updated') - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # No admin now, even though pingou the creator is there users = project.get_project_users(access='admin') self.assertEqual(len(users), 0) @@ -4407,11 +4407,11 @@ class PagureLibtests(tests.Modeltests): ''' tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # Let's add a new user to the project, 'foo' # By default, if no access is specified, he becomes an admin - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4436,7 +4436,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(users), 0) # Update the access level of foo user to commit - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4447,7 +4447,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'User access updated') # He is just a committer - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') users = project.get_project_users(access='admin', combine=False) self.assertEqual(len(users), 0) @@ -4462,7 +4462,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(users), 0) # Update the access level of foo user to ticket - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4473,7 +4473,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'User access updated') # He is just a ticketer - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') users = project.get_project_users(access='admin',combine=False) self.assertEqual(len(users), 0) @@ -4494,7 +4494,7 @@ class PagureLibtests(tests.Modeltests): # Create some projects tests.create_projects(self.session) # Create a group in database - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='JL', display_name='Justice League', @@ -4512,8 +4512,8 @@ class PagureLibtests(tests.Modeltests): # Add the group to project we just created, test # First add it as an admin - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4524,7 +4524,7 @@ class PagureLibtests(tests.Modeltests): # Now, the group is an admin in the project # so, it must have access to everything - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') groups = project.get_project_groups(access='admin') self.assertEqual(len(groups), 1) @@ -4556,8 +4556,8 @@ class PagureLibtests(tests.Modeltests): ) # Update the access level of the group, JL to commit - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4568,7 +4568,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Group access updated') # It shouldn't be an admin - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') groups = project.get_project_groups(access='admin') self.assertEqual(len(groups), 0) @@ -4595,7 +4595,7 @@ class PagureLibtests(tests.Modeltests): ) # Update the access of group JL to ticket - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4606,7 +4606,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Group access updated') # It is not an admin - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') groups = project.get_project_groups(access='admin') self.assertEqual(len(groups), 0) @@ -4634,7 +4634,7 @@ class PagureLibtests(tests.Modeltests): # Create some projects tests.create_projects(self.session) # Create a group in database - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='JL', display_name='Justice League', @@ -4652,8 +4652,8 @@ class PagureLibtests(tests.Modeltests): # Add the group to project we just created, test # First add it as an admin - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4664,7 +4664,7 @@ class PagureLibtests(tests.Modeltests): # Now, the group is an admin in the project # so, it must have access to everything - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') groups = project.get_project_groups(access='admin', combine=False) self.assertEqual(len(groups), 1) @@ -4684,8 +4684,8 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(groups), 0) # Update the access level of the group, JL to commit - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4696,7 +4696,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Group access updated') # It shouldn't be an admin - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') groups = project.get_project_groups(access='admin', combine=False) self.assertEqual(len(groups), 0) @@ -4716,7 +4716,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(len(groups), 0) # Update the access of group JL to ticket - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4727,7 +4727,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Group access updated') # It is not an admin - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') groups = project.get_project_groups(access='admin', combine=False) self.assertEqual(len(groups), 0) @@ -4754,8 +4754,8 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) # Add a user object - make him an admin first - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4764,9 +4764,9 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User added') - user = pagure.lib.query.get_user(self.session, key='foo') + user = retrieval_queries.get_user(self.session, key='foo') # He should be an admin - access_obj = pagure.lib.query.get_obj_access( + access_obj = retrieval_queries.get_obj_access( self.session, project_obj=project, obj=user @@ -4774,7 +4774,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(access_obj.access, 'admin') # Update and check for commit access - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4783,10 +4783,10 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() self.assertEqual(msg, 'User access updated') - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # He should be a committer - access_obj = pagure.lib.query.get_obj_access( + access_obj = retrieval_queries.get_obj_access( self.session, project_obj=project, obj=user @@ -4794,7 +4794,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(access_obj.access, 'commit') # Update and check for ticket access - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -4803,10 +4803,10 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() self.assertEqual(msg, 'User access updated') - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # He should be a ticketer - access_obj = pagure.lib.query.get_obj_access( + access_obj = retrieval_queries.get_obj_access( self.session, project_obj=project, obj=user @@ -4821,7 +4821,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) # Create a group in database - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='JL', display_name='Justice League', @@ -4838,8 +4838,8 @@ class PagureLibtests(tests.Modeltests): ) # Add a group object - make him an admin first - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') - msg = pagure.lib.query.add_group_to_project( + project = retrieval_queries.get_authorized_project(self.session, project_name='test') + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4848,9 +4848,9 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Group added') - group = pagure.lib.query.search_groups(self.session, group_name='JL') + group = retrieval_queries.search_groups(self.session, group_name='JL') # He should be an admin - access_obj = pagure.lib.query.get_obj_access( + access_obj = retrieval_queries.get_obj_access( self.session, project_obj=project, obj=group @@ -4858,7 +4858,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(access_obj.access, 'admin') # Update and check for commit access - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4868,9 +4868,9 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Group access updated') - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # He should be a committer - access_obj = pagure.lib.query.get_obj_access( + access_obj = retrieval_queries.get_obj_access( self.session, project_obj=project, obj=group, @@ -4878,7 +4878,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(access_obj.access, 'commit') # Update and check for ticket access - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( self.session, project=project, new_group='JL', @@ -4887,10 +4887,10 @@ class PagureLibtests(tests.Modeltests): ) self.session.commit() self.assertEqual(msg, 'Group access updated') - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') # He should be a ticketer - access_obj = pagure.lib.query.get_obj_access( + access_obj = retrieval_queries.get_obj_access( self.session, project_obj=project, obj=group, @@ -4912,7 +4912,7 @@ class PagureLibtests(tests.Modeltests): self.session.commit() # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=item, @@ -4927,30 +4927,30 @@ class PagureLibtests(tests.Modeltests): # Unknown user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.set_watch_obj, + retrieval_queries.set_watch_obj, self.session, 'unknown', iss, True ) # Invalid object to watch - project self.assertRaises( pagure.exceptions.InvalidObjectException, - pagure.lib.query.set_watch_obj, + retrieval_queries.set_watch_obj, self.session, 'foo', iss.project, True ) # Invalid object to watch - string self.assertRaises( AttributeError, - pagure.lib.query.set_watch_obj, + retrieval_queries.set_watch_obj, self.session, 'foo', 'ticket', True ) # Watch the ticket - out = pagure.lib.query.set_watch_obj(self.session, 'foo', iss, True) + out = retrieval_queries.set_watch_obj(self.session, 'foo', iss, True) self.assertEqual(out, 'You are now watching this issue') # Un-watch the ticket - out = pagure.lib.query.set_watch_obj(self.session, 'foo', iss, False) + out = retrieval_queries.set_watch_obj(self.session, 'foo', iss, False) self.assertEqual(out, 'You are no longer watching this issue') @@ -4969,7 +4969,7 @@ class PagureLibtests(tests.Modeltests): 'test123 test456') ] for inp, flds, rem in tests: - self.assertEqual(pagure.lib.query.tokenize_search_string(inp), + self.assertEqual(retrieval_queries.tokenize_search_string(inp), (flds, rem)) def test_save_report(self): @@ -4977,13 +4977,13 @@ class PagureLibtests(tests.Modeltests): # Create the projects tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') self.assertEqual(project.reports, {}) name = 'test report' url = '?foo=bar&baz=biz' - pagure.lib.query.save_report( + retrieval_queries.save_report( self.session, repo=project, name=name, @@ -4991,7 +4991,7 @@ class PagureLibtests(tests.Modeltests): username=None ) - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') self.assertEqual( project.reports, {'test report': {'baz': 'biz', 'foo': 'bar'}} @@ -5000,7 +5000,7 @@ class PagureLibtests(tests.Modeltests): name = 'test report #2' url = '?foo=bar&foo=none&foo=baz' - pagure.lib.query.save_report( + retrieval_queries.save_report( self.session, repo=project, name=name, @@ -5008,7 +5008,7 @@ class PagureLibtests(tests.Modeltests): username=None ) - project = pagure.lib.query.get_authorized_project(self.session, project_name='test') + project = retrieval_queries.get_authorized_project(self.session, project_name='test') self.assertEqual( project.reports, { @@ -5060,7 +5060,7 @@ foo bar

foo bar

""" with self.app.application.app_context(): - html = pagure.lib.query.text2markdown(text) + html = retrieval_queries.text2markdown(text) self.assertEqual(html, expected) @@ -5104,52 +5104,52 @@ foo bar

foo bar

""" with self.app.application.app_context(): - html = pagure.lib.query.text2markdown(text) + html = retrieval_queries.text2markdown(text) self.assertEqual(html, expected) def test_set_redis(self): - """ Test the set_redis function of pagure.lib.query. """ - self.assertIsNone(pagure.lib.query.REDIS) - pagure.lib.query.set_redis('0.0.0.0', 6379, 0) - self.assertIsNotNone(pagure.lib.query.REDIS) + """ Test the set_redis function of retrieval_queries. """ + self.assertIsNone(retrieval_queries.REDIS) + retrieval_queries.set_redis('0.0.0.0', 6379, 0) + self.assertIsNotNone(retrieval_queries.REDIS) def test_set_pagure_ci(self): - """ Test the set_pagure_ci function of pagure.lib.query. """ - # self.assertIn(pagure.lib.query.PAGURE_CI, [None, ['jenkins']]) - pagure.lib.query.set_pagure_ci(True) - self.assertIsNotNone(pagure.lib.query.PAGURE_CI) - self.assertTrue(pagure.lib.query.PAGURE_CI) + """ Test the set_pagure_ci function of retrieval_queries. """ + # self.assertIn(retrieval_queries.PAGURE_CI, [None, ['jenkins']]) + retrieval_queries.set_pagure_ci(True) + self.assertIsNotNone(retrieval_queries.PAGURE_CI) + self.assertTrue(retrieval_queries.PAGURE_CI) def test_get_user_invalid_user(self): - """ Test the get_user function of pagure.lib.query. """ + """ Test the get_user function of retrieval_queries. """ self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.get_user, + retrieval_queries.get_user, self.session, 'unknown' ) def test_get_user_username(self): - """ Test the get_user function of pagure.lib.query. """ - user = pagure.lib.query.get_user(self.session, 'foo') + """ Test the get_user function of retrieval_queries. """ + user = retrieval_queries.get_user(self.session, 'foo') self.assertEqual(user.username, 'foo') def test_get_user_email(self): - """ Test the get_user function of pagure.lib.query. """ - user = pagure.lib.query.get_user(self.session, 'bar@pingou.com') + """ Test the get_user function of retrieval_queries. """ + user = retrieval_queries.get_user(self.session, 'bar@pingou.com') self.assertEqual(user.username, 'pingou') def test_is_valid_ssh_key_empty(self): - """ Test the is_valid_ssh_key function of pagure.lib.query. """ - self.assertIsNone(pagure.lib.query.is_valid_ssh_key('')) + """ Test the is_valid_ssh_key function of retrieval_queries. """ + self.assertIsNone(retrieval_queries.is_valid_ssh_key('')) def test_is_valid_ssh_key_invalid(self): - """ Test the is_valid_ssh_key function of pagure.lib.query. """ - self.assertEqual(pagure.lib.query.is_valid_ssh_key('nonsense'), False) + """ Test the is_valid_ssh_key function of retrieval_queries. """ + self.assertEqual(retrieval_queries.is_valid_ssh_key('nonsense'), False) def test_is_valid_ssh_key(self): - """ Test the is_valid_ssh_key function of pagure.lib.query. """ - keyinfo = pagure.lib.query.is_valid_ssh_key('''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDtgzSO9d1IrKdmyBFUvtAJPLgGOhp0lSySkWRSe+/+3KXYjSnsLnCJQlO5M7JfaXhtTHEow86rh4W9+FoJdzo5iocAwH5xPZ5ttHLy7VHgTzNMUeMgKpjy6bBOdPoGPPG4mo7QCMCRJdWBRDv4OSEMLU5jQAvC272YK2V8L918VQ== root@test''') + """ Test the is_valid_ssh_key function of retrieval_queries. """ + keyinfo = retrieval_queries.is_valid_ssh_key('''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDtgzSO9d1IrKdmyBFUvtAJPLgGOhp0lSySkWRSe+/+3KXYjSnsLnCJQlO5M7JfaXhtTHEow86rh4W9+FoJdzo5iocAwH5xPZ5ttHLy7VHgTzNMUeMgKpjy6bBOdPoGPPG4mo7QCMCRJdWBRDv4OSEMLU5jQAvC272YK2V8L918VQ== root@test''') keys = keyinfo.split('\n') self.assertEqual(len(keys), 2) self.assertEqual(keys[1], '') @@ -5161,36 +5161,36 @@ foo bar def test_create_deploykeys_ssh_keys_on_disk_empty(self): """ Test the create_deploykeys_ssh_keys_on_disk function of - pagure.lib.query. """ + retrieval_queries. """ self.assertIsNone( - pagure.lib.query.create_deploykeys_ssh_keys_on_disk(None, None)) + retrieval_queries.create_deploykeys_ssh_keys_on_disk(None, None)) self.assertFalse( os.path.exists(os.path.join(self.path, 'deploykeys', 'test'))) def test_create_deploykeys_ssh_keys_on_disk_nokey(self): """ Test the create_deploykeys_ssh_keys_on_disk function of - pagure.lib.query. """ + retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertIsNone( - pagure.lib.query.create_deploykeys_ssh_keys_on_disk( + retrieval_queries.create_deploykeys_ssh_keys_on_disk( project, self.path)) self.assertTrue( os.path.exists(os.path.join(self.path, 'deploykeys', 'test'))) self.assertEqual( os.listdir(os.path.join(self.path, 'deploykeys', 'test')), []) - @patch('pagure.lib.query.is_valid_ssh_key', MagicMock(return_value='foo bar')) + @patch('retrieval_queries.is_valid_ssh_key', MagicMock(return_value='foo bar')) def test_create_deploykeys_ssh_keys_on_disk(self): """ Test the create_deploykeys_ssh_keys_on_disk function of - pagure.lib.query. """ + retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') # Add a deploy key to the project - pingou = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query.add_sshkey_to_project_or_user( + pingou = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries.add_sshkey_to_project_or_user( self.session, project=project, ssh_key='foo bar', @@ -5200,7 +5200,7 @@ foo bar self.assertEqual(msg, 'SSH key added') self.assertIsNone( - pagure.lib.query.create_deploykeys_ssh_keys_on_disk( + retrieval_queries.create_deploykeys_ssh_keys_on_disk( project, self.path)) self.assertTrue( os.path.exists(os.path.join(self.path, 'deploykeys', 'test'))) @@ -5209,25 +5209,25 @@ foo bar ['deploykey_test_1.pub']) # Remove the deploykey - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.session.delete(project.deploykeys[0]) self.session.commit() # Remove the file on disk self.assertIsNone( - pagure.lib.query.create_deploykeys_ssh_keys_on_disk( + retrieval_queries.create_deploykeys_ssh_keys_on_disk( project, self.path)) self.assertTrue( os.path.exists(os.path.join(self.path, 'deploykeys', 'test'))) self.assertEqual( os.listdir(os.path.join(self.path, 'deploykeys', 'test')), []) - @patch('pagure.lib.query.is_valid_ssh_key', MagicMock(return_value='\nfoo bar')) + @patch('retrieval_queries.is_valid_ssh_key', MagicMock(return_value='\nfoo bar')) def test_create_deploykeys_ssh_keys_on_disk_empty_first_key(self): """ Test the create_deploykeys_ssh_keys_on_disk function of - pagure.lib.query. """ + retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') # Add a deploy key to the project new_key_obj = pagure.lib.model.SSHKey( @@ -5243,7 +5243,7 @@ foo bar self.session.commit() self.assertIsNone( - pagure.lib.query.create_deploykeys_ssh_keys_on_disk( + retrieval_queries.create_deploykeys_ssh_keys_on_disk( project, self.path)) self.assertTrue( os.path.exists(os.path.join(self.path, 'deploykeys', 'test'))) @@ -5253,9 +5253,9 @@ foo bar def test_create_deploykeys_ssh_keys_on_disk_invalid(self): """ Test the create_deploykeys_ssh_keys_on_disk function of - pagure.lib.query. """ + retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') # Add a deploy key to the project new_key_obj = pagure.lib.model.SSHKey( @@ -5271,7 +5271,7 @@ foo bar self.session.commit() self.assertIsNone( - pagure.lib.query.create_deploykeys_ssh_keys_on_disk( + retrieval_queries.create_deploykeys_ssh_keys_on_disk( project, self.path)) self.assertTrue( os.path.exists(os.path.join(self.path, 'deploykeys', 'test'))) @@ -5280,25 +5280,25 @@ foo bar []) def test_create_user_ssh_keys_on_disk_none(self): - """ Test the create_user_ssh_keys_on_disk function of pagure.lib.query. """ + """ Test the create_user_ssh_keys_on_disk function of retrieval_queries. """ self.assertIsNone( - pagure.lib.query.create_user_ssh_keys_on_disk(None, None)) + retrieval_queries.create_user_ssh_keys_on_disk(None, None)) def test_update_user_settings_invalid_user(self): - """ Test the update_user_settings function of pagure.lib.query. """ + """ Test the update_user_settings function of retrieval_queries. """ self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.update_user_settings, + retrieval_queries.update_user_settings, session=self.session, settings={}, user='invalid' ) def test_update_user_settings_no_change(self): - """ Test the update_user_settings function of pagure.lib.query. """ + """ Test the update_user_settings function of retrieval_queries. """ # First update the setting - msg = pagure.lib.query.update_user_settings( + msg = retrieval_queries.update_user_settings( session=self.session, settings={'cc_me_to_my_actions': True}, user='pingou' @@ -5306,7 +5306,7 @@ foo bar self.assertEqual(msg, 'Successfully edited your settings') # Then change it back to its default - msg = pagure.lib.query.update_user_settings( + msg = retrieval_queries.update_user_settings( session=self.session, settings={}, user='pingou' @@ -5314,9 +5314,9 @@ foo bar self.assertEqual(msg, 'Successfully edited your settings') def test_update_user_settings_no_data(self): - """ Test the update_user_settings function of pagure.lib.query. """ + """ Test the update_user_settings function of retrieval_queries. """ - msg = pagure.lib.query.update_user_settings( + msg = retrieval_queries.update_user_settings( session=self.session, settings={'cc_me_to_my_actions': False}, user='pingou' @@ -5324,9 +5324,9 @@ foo bar self.assertEqual(msg, 'No settings to change') def test_update_user_settings(self): - """ Test the update_user_settings function of pagure.lib.query. """ + """ Test the update_user_settings function of retrieval_queries. """ - msg = pagure.lib.query.update_user_settings( + msg = retrieval_queries.update_user_settings( session=self.session, settings={'cc_me_to_my_actions': True}, user='pingou' @@ -5339,7 +5339,7 @@ foo bar """ Test the add_email_to_user function of pagure.lib when there are log entries associated to the email added. """ - user = pagure.lib.query.search_user(self.session, username='pingou') + user = retrieval_queries.search_user(self.session, username='pingou') # Add a couple of log entries associated with the new email for i in range(3): @@ -5355,7 +5355,7 @@ foo bar self.assertEqual(len(user.emails), 2) # Add the new_email to the user - pagure.lib.query.add_email_to_user( + retrieval_queries.add_email_to_user( self.session, user, 'new_email@pingoured.fr' ) self.session.commit() @@ -5366,7 +5366,7 @@ foo bar # add another email address that is not in an allowed domain self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_email_to_user, + retrieval_queries.add_email_to_user, session=self.session, user=user, user_email='foo@bar.com' @@ -5378,7 +5378,7 @@ foo bar # redo tests with 2 allowed domains pagure.config.config['ALLOWED_EMAIL_DOMAINS'] = ["pingoured.fr", "example.com"] # Add the new_email to the user - pagure.lib.query.add_email_to_user( + retrieval_queries.add_email_to_user( self.session, user, 'another_email@example.com' ) self.session.commit() @@ -5388,7 +5388,7 @@ foo bar # add another email address that is not in an allowed domain self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_email_to_user, + retrieval_queries.add_email_to_user, session=self.session, user=user, user_email='another_foo@bar.com' @@ -5397,12 +5397,12 @@ foo bar # Check emails after self.assertEqual(len(user.emails), 4) - @patch('pagure.lib.query.is_valid_ssh_key', MagicMock(return_value='foo bar')) + @patch('retrieval_queries.is_valid_ssh_key', MagicMock(return_value='foo bar')) def test_update_user_ssh_valid_key(self): - """ Test the update_user_ssh function of pagure.lib.query. """ + """ Test the update_user_ssh function of retrieval_queries. """ pagure.SESSION = self.session - pagure.lib.query.update_user_ssh( + retrieval_queries.update_user_ssh( self.session, user='pingou', ssh_key='foo key', @@ -5419,12 +5419,12 @@ foo bar ) def test_add_user_pending_email_existing_email(self): - """ Test the add_user_pending_email function of pagure.lib.query. """ - user = pagure.lib.query.search_user(self.session, username='pingou') + """ Test the add_user_pending_email function of retrieval_queries. """ + user = retrieval_queries.search_user(self.session, username='pingou') self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_pending_email, + retrieval_queries.add_user_pending_email, session=self.session, userobj=user, email='foo@bar.com' @@ -5434,13 +5434,13 @@ foo bar @patch.dict(pagure.config.config, { 'ALLOWED_EMAIL_DOMAINS': ["pingoured.fr"]}, clear=True) def test_add_user_pending_email(self): - """ Test the add_user_pending_email function of pagure.lib.query. """ - user = pagure.lib.query.search_user(self.session, username='pingou') + """ Test the add_user_pending_email function of retrieval_queries. """ + user = retrieval_queries.search_user(self.session, username='pingou') self.assertEqual(len(user.emails), 2) self.assertEqual(len(user.emails_pending), 0) - pagure.lib.query.add_user_pending_email( + retrieval_queries.add_user_pending_email( session=self.session, userobj=user, email='new_mail@pingoured.fr' @@ -5452,7 +5452,7 @@ foo bar # add another email address that is not allowed self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_pending_email, + retrieval_queries.add_user_pending_email, session=self.session, userobj=user, email='foo@bar.com' @@ -5463,32 +5463,32 @@ foo bar self.assertEqual(len(user.emails_pending), 1) def test_resend_pending_email_someone_else_email(self): - """ Test the resend_pending_email function of pagure.lib.query. """ - user = pagure.lib.query.search_user(self.session, username='pingou') + """ Test the resend_pending_email function of retrieval_queries. """ + user = retrieval_queries.search_user(self.session, username='pingou') self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.resend_pending_email, + retrieval_queries.resend_pending_email, session=self.session, userobj=user, email='foo@bar.com' ) def test_resend_pending_email_email_validated(self): - """ Test the resend_pending_email function of pagure.lib.query. """ - user = pagure.lib.query.search_user(self.session, username='pingou') + """ Test the resend_pending_email function of retrieval_queries. """ + user = retrieval_queries.search_user(self.session, username='pingou') self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.resend_pending_email, + retrieval_queries.resend_pending_email, session=self.session, userobj=user, email='foo@pingou.com' ) def test_get_acls(self): - """ Test the get_acls function of pagure.lib.query. """ - acls = pagure.lib.query.get_acls(self.session) + """ Test the get_acls function of retrieval_queries. """ + acls = retrieval_queries.get_acls(self.session) self.assertEqual( sorted([a.name for a in acls]), [ @@ -5517,52 +5517,52 @@ foo bar ) def test_get_acls_restrict_one(self): - """ Test the get_acls function of pagure.lib.query. """ - acls = pagure.lib.query.get_acls(self.session, restrict='create_project') + """ Test the get_acls function of retrieval_queries. """ + acls = retrieval_queries.get_acls(self.session, restrict='create_project') self.assertEqual([a.name for a in acls], ['create_project']) def test_get_acls_restrict_two(self): - """ Test the get_acls function of pagure.lib.query. """ - acls = pagure.lib.query.get_acls( + """ Test the get_acls function of retrieval_queries. """ + acls = retrieval_queries.get_acls( self.session, restrict=['create_project', 'issue_create']) self.assertEqual( [a.name for a in acls], ['create_project', 'issue_create']) def test_filter_img_src(self): - """ Test the filter_img_src function of pagure.lib.query. """ + """ Test the filter_img_src function of retrieval_queries. """ for name in ('alt', 'height', 'width', 'class'): - self.assertTrue(pagure.lib.query.filter_img_src(name, 'caption')) + self.assertTrue(retrieval_queries.filter_img_src(name, 'caption')) - self.assertTrue(pagure.lib.query.filter_img_src( + self.assertTrue(retrieval_queries.filter_img_src( 'src', '/path/to/image')) - self.assertTrue(pagure.lib.query.filter_img_src( + self.assertTrue(retrieval_queries.filter_img_src( 'src', 'http://localhost.localdomain/path/to/image')) - self.assertFalse(pagure.lib.query.filter_img_src( + self.assertFalse(retrieval_queries.filter_img_src( 'src', 'http://foo.org/path/to/image')) - self.assertFalse(pagure.lib.query.filter_img_src( + self.assertFalse(retrieval_queries.filter_img_src( 'anything', 'http://foo.org/path/to/image')) def test_clean_input(self): - """ Test the clean_input function of pagure.lib.query. """ + """ Test the clean_input function of retrieval_queries. """ text = 'Click here' - output = pagure.lib.query.clean_input(text) + output = retrieval_queries.clean_input(text) self.assertEqual(output, text) def test_could_be_text(self): - """ Test the could_be_text function of pagure.lib.query. """ - self.assertTrue(pagure.lib.query.could_be_text(b'foo')) - self.assertTrue(pagure.lib.query.could_be_text('fâö'.encode("utf-8"))) - self.assertFalse(pagure.lib.query.could_be_text(b'\x89PNG\r\n\x1a\n\x00')) + """ Test the could_be_text function of retrieval_queries. """ + self.assertTrue(retrieval_queries.could_be_text(b'foo')) + self.assertTrue(retrieval_queries.could_be_text('fâö'.encode("utf-8"))) + self.assertFalse(retrieval_queries.could_be_text(b'\x89PNG\r\n\x1a\n\x00')) def test_set_custom_key_fields_empty(self): - """ Test the set_custom_key_fields function of pagure.lib.query. """ + """ Test the set_custom_key_fields function of retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertIsNotNone(project) - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=project, fields=[], @@ -5574,13 +5574,13 @@ foo bar self.assertEqual(msg, 'List of custom fields updated') def test_set_custom_key_fields(self): - """ Test the set_custom_key_fields function of pagure.lib.query. """ + """ Test the set_custom_key_fields function of retrieval_queries. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertIsNotNone(project) # Set a custom key - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=project, fields=['upstream'], @@ -5592,7 +5592,7 @@ foo bar self.assertEqual(msg, 'List of custom fields updated') # Set another one, with notifications on - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=project, fields=['bugzilla_url'], @@ -5604,7 +5604,7 @@ foo bar self.assertEqual(msg, 'List of custom fields updated') # Re-set the second one but with notifications off - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=project, fields=['bugzilla_url'], @@ -5615,17 +5615,17 @@ foo bar self.session.commit() self.assertEqual(msg, 'List of custom fields updated') - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') def test_set_custom_key_value_boolean(self, mock_redis): - """ Test the set_custom_key_value function of pagure.lib.query. """ + """ Test the set_custom_key_value function of retrieval_queries. """ mock_redis.return_value = True tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertIsNotNone(project) # Set a custom key - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=project, fields=['tested'], @@ -5637,7 +5637,7 @@ foo bar self.assertEqual(msg, 'List of custom fields updated') # Create issues - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=project, title='Test issue', @@ -5647,11 +5647,11 @@ foo bar self.session.commit() self.assertEqual(msg.title, 'Test issue') - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + issue = retrieval_queries.search_issues(self.session, project, issueid=1) self.assertEqual(len(project.issue_keys), 1) self.assertEqual(project.issue_keys[0].key_type, 'boolean') - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=issue, key=project.issue_keys[0], @@ -5661,7 +5661,7 @@ foo bar self.assertEqual(msg, 'Custom field tested adjusted to True') # Update it a second time to trigger edit - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=issue, key=project.issue_keys[0], @@ -5676,17 +5676,17 @@ foo bar self.assertEqual(mock_redis.publish.call_count, 2) - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') def test_set_custom_key_value_boolean_private_issue(self, mock_redis): - """ Test the set_custom_key_value function of pagure.lib.query. """ + """ Test the set_custom_key_value function of retrieval_queries. """ mock_redis.return_value = True tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertIsNotNone(project) # Set a custom key - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=project, fields=['tested'], @@ -5698,7 +5698,7 @@ foo bar self.assertEqual(msg, 'List of custom fields updated') # Create issues - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=project, title='Test issue', @@ -5709,11 +5709,11 @@ foo bar self.session.commit() self.assertEqual(msg.title, 'Test issue') - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + issue = retrieval_queries.search_issues(self.session, project, issueid=1) self.assertEqual(len(project.issue_keys), 1) self.assertEqual(project.issue_keys[0].key_type, 'boolean') - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=issue, key=project.issue_keys[0], @@ -5723,7 +5723,7 @@ foo bar self.assertEqual(msg, 'Custom field tested adjusted to True') # Update it a second time to trigger edit - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=issue, key=project.issue_keys[0], @@ -5739,17 +5739,17 @@ foo bar self.assertEqual(mock_redis.publish.call_count, 2) - @patch('pagure.lib.query.REDIS') + @patch('retrieval_queries.REDIS') def test_set_custom_key_value_text(self, mock_redis): - """ Test the set_custom_key_value function of pagure.lib.query. """ + """ Test the set_custom_key_value function of retrieval_queries. """ mock_redis.return_value = True tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertIsNotNone(project) # Set a custom key - msg = pagure.lib.query.set_custom_key_fields( + msg = retrieval_queries.set_custom_key_fields( session=self.session, project=project, fields=['tested'], @@ -5761,7 +5761,7 @@ foo bar self.assertEqual(msg, 'List of custom fields updated') # Create issues - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=project, title='Test issue', @@ -5771,11 +5771,11 @@ foo bar self.session.commit() self.assertEqual(msg.title, 'Test issue') - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + issue = retrieval_queries.search_issues(self.session, project, issueid=1) self.assertEqual(len(project.issue_keys), 1) self.assertEqual(project.issue_keys[0].key_type, 'text') - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=issue, key=project.issue_keys[0], @@ -5785,7 +5785,7 @@ foo bar self.assertEqual(msg, 'Custom field tested adjusted to In progress') # Update it a second time to trigger edit - msg = pagure.lib.query.set_custom_key_value( + msg = retrieval_queries.set_custom_key_value( session=self.session, issue=issue, key=project.issue_keys[0], @@ -5797,12 +5797,12 @@ foo bar self.assertEqual(mock_redis.publish.call_count, 2) def test_log_action_invalid(self): - """ Test the log_action function of pagure.lib.query. """ + """ Test the log_action function of retrieval_queries. """ obj = MagicMock obj.isa = "invalid" self.assertRaises( pagure.exceptions.InvalidObjectException, - pagure.lib.query.log_action, + retrieval_queries.log_action, session=self.session, action="foo", obj=obj, @@ -5810,12 +5810,12 @@ foo bar ) def test_search_token_no_acls(self): - """ Test the search_token function of pagure.lib.query. """ + """ Test the search_token function of retrieval_queries. """ tests.create_projects(self.session) tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - out = pagure.lib.query.search_token( + out = retrieval_queries.search_token( self.session, [] ) @@ -5823,12 +5823,12 @@ foo bar self.assertEqual(out[0].id, 'aaabbbcccddd') def test_search_token_single_acls(self): - """ Test the search_token function of pagure.lib.query. """ + """ Test the search_token function of retrieval_queries. """ tests.create_projects(self.session) tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - out = pagure.lib.query.search_token( + out = retrieval_queries.search_token( self.session, 'issue_create', ) @@ -5836,12 +5836,12 @@ foo bar self.assertEqual(out[0].id, 'aaabbbcccddd') def test_search_token_single_acls_user(self): - """ Test the search_token function of pagure.lib.query. """ + """ Test the search_token function of retrieval_queries. """ tests.create_projects(self.session) tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - out = pagure.lib.query.search_token( + out = retrieval_queries.search_token( self.session, 'issue_create', user='pingou', @@ -5849,7 +5849,7 @@ foo bar self.assertEqual(len(out), 1) self.assertEqual(out[0].id, 'aaabbbcccddd') - out = pagure.lib.query.search_token( + out = retrieval_queries.search_token( self.session, 'issue_create', user='foo', @@ -5857,12 +5857,12 @@ foo bar self.assertEqual(len(out), 0) def test_search_token_single_acls_active(self): - """ Test the search_token function of pagure.lib.query. """ + """ Test the search_token function of retrieval_queries. """ tests.create_projects(self.session) tests.create_tokens(self.session) tests.create_tokens_acl(self.session) - out = pagure.lib.query.search_token( + out = retrieval_queries.search_token( self.session, 'issue_create', active=True @@ -5870,7 +5870,7 @@ foo bar self.assertEqual(len(out), 1) self.assertEqual(out[0].id, 'aaabbbcccddd') - out = pagure.lib.query.search_token( + out = retrieval_queries.search_token( self.session, 'issue_create', expired=True @@ -5882,22 +5882,22 @@ foo bar tests.create_projects(self.session) - project_obj = pagure.lib.query._get_project(self.session, 'test') + project_obj = retrieval_queries._get_project(self.session, 'test') # Default mode of project is read only self.assertEqual(project_obj.read_only, True) # Remove read only - pagure.lib.query.update_read_only_mode(self.session, project_obj, False) + retrieval_queries.update_read_only_mode(self.session, project_obj, False) self.session.commit() - project_obj = pagure.lib.query._get_project(self.session, 'test') + project_obj = retrieval_queries._get_project(self.session, 'test') self.assertEqual(project_obj.read_only, False) # Try reversing it back - pagure.lib.query.update_read_only_mode(self.session, project_obj, True) + retrieval_queries.update_read_only_mode(self.session, project_obj, True) self.session.commit() - project_obj = pagure.lib.query._get_project(self.session, 'test') + project_obj = retrieval_queries._get_project(self.session, 'test') self.assertEqual(project_obj.read_only, True) diff --git a/tests/test_pagure_lib_add_user_to_project.py b/tests/test_pagure_lib_add_user_to_project.py index ea491ad..9797b2e 100644 --- a/tests/test_pagure_lib_add_user_to_project.py +++ b/tests/test_pagure_lib_add_user_to_project.py @@ -19,12 +19,12 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import tests class PagureLibAddUserToProjecttests(tests.Modeltests): - """ Tests for pagure.lib.query.add_user_to_project """ + """ Tests for retrieval_queries.add_user_to_project """ def setUp(self): """ Set up the environnment, ran before every tests. """ @@ -47,10 +47,10 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): self.session.commit() # Before - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 0) - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -60,7 +60,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): self.assertEqual(msg, 'User added') # After - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 1) self.assertEqual(repo.users[0].user, 'foo') self.assertEqual(repo.admins[0].user, 'foo') @@ -68,12 +68,12 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) def test_re_add_user_to_project_default(self): """ Update an existing user but to the same access level. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # Try adding the same user with the same access self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foo', @@ -85,10 +85,10 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): def test_update_user_to_project_default(self): """ Update an existing user without any required group membership. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # Update the access of the user - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -107,7 +107,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): Update an existing user but required group membership on all projects. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') config = { '*': ['packager'] } @@ -115,7 +115,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): # Update the access of the user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foo', @@ -134,7 +134,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): Update an existing user but required group membership on all projects match *st. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') config = { '*st': ['packager'] } @@ -142,7 +142,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): # Update the access of the user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foo', @@ -161,7 +161,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): Update an existing user but required group membership on all projects match te*. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') config = { 'te*': ['packager'] } @@ -169,7 +169,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): # Update the access of the user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foo', @@ -188,7 +188,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): Update an existing user but required group membership on a specific project: test. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') config = { 'test': ['packager'] } @@ -196,7 +196,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): # Update the access of the user self.assertRaises( pagure.exceptions.PagureException, - pagure.lib.query.add_user_to_project, + retrieval_queries.add_user_to_project, session=self.session, project=repo, new_user='foo', @@ -215,7 +215,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): Add user to project test2 while the configuration requires group membership on the project test. """ - repo = pagure.lib.query._get_project(self.session, 'test2') + repo = retrieval_queries._get_project(self.session, 'test2') self.assertEqual(len(repo.users), 0) config = { @@ -223,7 +223,7 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): } # Add the user - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -238,14 +238,14 @@ class PagureLibAddUserToProjecttests(tests.Modeltests): class PagureLibAddUserToProjectWithGrouptests( PagureLibAddUserToProjecttests): - """ Tests for pagure.lib.query.add_user_to_project """ + """ Tests for retrieval_queries.add_user_to_project """ def setUp(self): """ Set up the environnment, ran before every tests. """ super(PagureLibAddUserToProjectWithGrouptests, self).setUp() # Create group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='packager', display_name='packager', @@ -258,8 +258,8 @@ class PagureLibAddUserToProjectWithGrouptests( self.assertEqual(msg, 'User `pingou` added to the group `packager`.') # Add user to group - group = pagure.lib.query.search_groups(self.session, group_name='packager') - msg = pagure.lib.query.add_user_to_group( + group = retrieval_queries.search_groups(self.session, group_name='packager') + msg = retrieval_queries.add_user_to_group( self.session, username='bar', group=group, @@ -274,7 +274,7 @@ class PagureLibAddUserToProjectWithGrouptests( Add user to project test while the configuration requires group membership on the project test. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 1) config = { @@ -282,7 +282,7 @@ class PagureLibAddUserToProjectWithGrouptests( } # Add the user to the project - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='bar', @@ -292,7 +292,7 @@ class PagureLibAddUserToProjectWithGrouptests( ) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 2) self.assertEqual(repo.users[0].user, 'foo') self.assertEqual(repo.committers[0].user, 'foo') @@ -305,7 +305,7 @@ class PagureLibAddUserToProjectWithGrouptests( Add user to project test while the configuration requires group membership on all the projects. """ - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 1) config = { @@ -313,7 +313,7 @@ class PagureLibAddUserToProjectWithGrouptests( } # Add the user to the project - pagure.lib.query.add_user_to_project( + retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='bar', @@ -323,7 +323,7 @@ class PagureLibAddUserToProjectWithGrouptests( ) self.session.commit() - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertEqual(len(repo.users), 2) self.assertEqual(repo.users[0].user, 'foo') self.assertEqual(repo.committers[0].user, 'foo') diff --git a/tests/test_pagure_lib_drop_issue.py b/tests/test_pagure_lib_drop_issue.py index fec9659..58e306e 100644 --- a/tests/test_pagure_lib_drop_issue.py +++ b/tests/test_pagure_lib_drop_issue.py @@ -23,13 +23,13 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.model import tests class PagureLibDropIssuetests(tests.Modeltests): - """ Tests for pagure.lib.query.drop_issue """ + """ Tests for retrieval_queries.drop_issue """ @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') @@ -44,16 +44,16 @@ class PagureLibDropIssuetests(tests.Modeltests): tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Before - issues = pagure.lib.query.search_issues(self.session, repo) + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 0) self.assertEqual(repo.open_tickets, 0) self.assertEqual(repo.open_tickets_public, 0) # Create two issues to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -65,7 +65,7 @@ class PagureLibDropIssuetests(tests.Modeltests): self.assertEqual(repo.open_tickets, 1) self.assertEqual(repo.open_tickets_public, 1) - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue #2', @@ -79,11 +79,11 @@ class PagureLibDropIssuetests(tests.Modeltests): self.assertEqual(repo.open_tickets_public, 2) # After - issues = pagure.lib.query.search_issues(self.session, repo) + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 2) # Add tag to the project - pagure.lib.query.new_tag( + retrieval_queries.new_tag( self.session, 'red', 'red tag', @@ -92,7 +92,7 @@ class PagureLibDropIssuetests(tests.Modeltests): ) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual( str(repo.tags_colored), '[TagColored(id: 1, tag:red, tag_description:red tag, color:#ff0000)]' @@ -102,7 +102,7 @@ class PagureLibDropIssuetests(tests.Modeltests): @patch('pagure.lib.notify.send_email') @patch('pagure.lib.git._maybe_wait', tests.definitely_wait) def test_drop_issue(self, p_send_email, p_ugt): - """ Test the drop_issue of pagure.lib.query. + """ Test the drop_issue of retrieval_queries. We had an issue where we could not delete issue that had been tagged with this test, we create two issues, tag one of them and delete @@ -111,11 +111,11 @@ class PagureLibDropIssuetests(tests.Modeltests): p_send_email.return_value = True p_ugt.return_value = True - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add tag to the second issue - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) - msgs = pagure.lib.query.update_tags( + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) + msgs = retrieval_queries.update_tags( self.session, issue, tags=['red'], @@ -125,28 +125,28 @@ class PagureLibDropIssuetests(tests.Modeltests): self.assertEqual(msgs, ['Issue tagged with: red']) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 2) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual( str(issue.tags), '[TagColored(id: 1, tag:red, tag_description:red tag, color:#ff0000)]' ) # Drop the issue #2 - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) - pagure.lib.query.drop_issue( + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) + retrieval_queries.drop_issue( self.session, issue, user='pingou') self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 1) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') @patch('pagure.lib.git._maybe_wait', tests.definitely_wait) def test_drop_issue_two_issues_one_tag(self, p_send_email, p_ugt): - """ Test the drop_issue of pagure.lib.query. + """ Test the drop_issue of retrieval_queries. We had an issue where we could not delete issue that had been tagged with this test, we create two issues, tag them both and delete one @@ -155,11 +155,11 @@ class PagureLibDropIssuetests(tests.Modeltests): p_send_email.return_value = True p_ugt.return_value = True - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add the tag to both issues - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) - msgs = pagure.lib.query.update_tags( + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) + msgs = retrieval_queries.update_tags( self.session, issue, tags=['red'], @@ -168,8 +168,8 @@ class PagureLibDropIssuetests(tests.Modeltests): self.session.commit() self.assertEqual(msgs, ['Issue tagged with: red']) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) - msgs = pagure.lib.query.update_tags( + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) + msgs = retrieval_queries.update_tags( self.session, issue, tags=['red'], @@ -178,34 +178,34 @@ class PagureLibDropIssuetests(tests.Modeltests): self.session.commit() self.assertEqual(msgs, ['Issue tagged with: red']) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 2) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( str(issue.tags), '[TagColored(id: 1, tag:red, tag_description:red tag, color:#ff0000)]' ) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertEqual( str(issue.tags), '[TagColored(id: 1, tag:red, tag_description:red tag, color:#ff0000)]' ) # Drop the issue #2 - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) - pagure.lib.query.drop_issue( + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) + retrieval_queries.drop_issue( self.session, issue, user='pingou') self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 1) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) self.assertEqual( str(issue.tags), '[TagColored(id: 1, tag:red, tag_description:red tag, color:#ff0000)]' ) - issue = pagure.lib.query.search_issues(self.session, repo, issueid=2) + issue = retrieval_queries.search_issues(self.session, repo, issueid=2) self.assertIsNone(issue) diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index 281545f..974bb40 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -43,10 +43,10 @@ class PagureLibGittests(tests.Modeltests): when the new uesr is an made an admin """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add an user to a project # The user will be an admin of the project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -377,17 +377,17 @@ repo requests/somenamespace/test3 """ Test write_gitolite_acls function to add deploy keys. """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add two deploy keys (one readonly one push) - pingou = pagure.lib.query.get_user(self.session, 'pingou') - msg1 = pagure.lib.query.add_sshkey_to_project_or_user( + pingou = retrieval_queries.get_user(self.session, 'pingou') + msg1 = retrieval_queries.add_sshkey_to_project_or_user( session=self.session, project=repo, ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==', pushaccess=False, creator=pingou ) - msg2 = pagure.lib.query.add_sshkey_to_project_or_user( + msg2 = retrieval_queries.add_sshkey_to_project_or_user( session=self.session, project=repo, ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC9Xwc2RDzPBhlEDARfHldGjudIVoa04tqT1JVKGQmyllTFz7Rb8CngQL3e7zyNzotnhwYKHdoiLlPkVEiDee4dWMUe48ilqId+FJZQGhyv8fu4BoFdE1AJUVylzmltbLg14VqG5gjTpXgtlrEva9arKwBMHJjRYc8ScaSn3OgyQw==', @@ -496,10 +496,10 @@ repo requests/forks/pingou/test3 when the new uesr is just a ticketer """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add an user to a project # The user will be an admin of the project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -599,10 +599,10 @@ repo requests/forks/pingou/test3 when the new uesr is just a committer """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add an user to a project # The user will be an admin of the project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -707,11 +707,11 @@ repo requests/forks/pingou/test3 """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add a couple of groups # They would be admins - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='sysadmin', display_name='sysadmin group', @@ -723,7 +723,7 @@ repo requests/forks/pingou/test3 ) self.session.commit() self.assertEqual(msg, 'User `pingou` added to the group `sysadmin`.') - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='devs', display_name='devs group', @@ -737,7 +737,7 @@ repo requests/forks/pingou/test3 self.assertEqual(msg, 'User `pingou` added to the group `devs`.') # Associate these groups to a project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='sysadmin', @@ -745,7 +745,7 @@ repo requests/forks/pingou/test3 ) self.session.commit() self.assertEqual(msg, 'Group added') - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='devs', @@ -755,7 +755,7 @@ repo requests/forks/pingou/test3 self.assertEqual(msg, 'Group added') # Add an user to a project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -867,11 +867,11 @@ repo requests/forks/pingou/test2 """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add a couple of groups # They would be ticketers - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='sysadmin', display_name='sysadmin group', @@ -883,7 +883,7 @@ repo requests/forks/pingou/test2 ) self.session.commit() self.assertEqual(msg, 'User `pingou` added to the group `sysadmin`.') - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='devs', display_name='devs group', @@ -897,7 +897,7 @@ repo requests/forks/pingou/test2 self.assertEqual(msg, 'User `pingou` added to the group `devs`.') # Associate these groups to a project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='sysadmin', @@ -906,7 +906,7 @@ repo requests/forks/pingou/test2 ) self.session.commit() self.assertEqual(msg, 'Group added') - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='devs', @@ -917,7 +917,7 @@ repo requests/forks/pingou/test2 self.assertEqual(msg, 'Group added') # Add an user to a project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -1025,11 +1025,11 @@ repo requests/forks/pingou/test2 """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Add a couple of groups # They would be committers - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='sysadmin', display_name='sysadmin group', @@ -1041,7 +1041,7 @@ repo requests/forks/pingou/test2 ) self.session.commit() self.assertEqual(msg, 'User `pingou` added to the group `sysadmin`.') - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='devs', display_name='devs group', @@ -1055,7 +1055,7 @@ repo requests/forks/pingou/test2 self.assertEqual(msg, 'User `pingou` added to the group `devs`.') # Associate these groups to a project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='sysadmin', @@ -1064,7 +1064,7 @@ repo requests/forks/pingou/test2 ) self.session.commit() self.assertEqual(msg, 'Group added') - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=repo, new_group='devs', @@ -1075,7 +1075,7 @@ repo requests/forks/pingou/test2 self.assertEqual(msg, 'Group added') # Add an user to a project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -1187,7 +1187,7 @@ repo requests/forks/pingou/test2 """ tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # Make the project enforce the PR workflow settings = repo.settings settings['pull_request_access_only'] = True @@ -1197,7 +1197,7 @@ repo requests/forks/pingou/test2 # Add an user to a project # The user will be an admin of the project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -1297,12 +1297,12 @@ repo requests/forks/pingou/test3 """ tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') self.assertFalse(repo.settings['pull_request_access_only']) # Add an user to a project # The user will be an admin of the project - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=repo, new_user='foo', @@ -1407,9 +1407,9 @@ repo requests/forks/pingou/test3 'test_ticket_repo.git') pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.query.get_authorized_project(self.session, 'test_ticket_repo') + repo = retrieval_queries.get_authorized_project(self.session, 'test_ticket_repo') # Create an issue to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -1417,7 +1417,7 @@ repo requests/forks/pingou/test3 user='pingou', ) self.assertEqual(msg.title, 'Test issue') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) pagure.lib.git.update_git(issue, repo).get() repo = pygit2.Repository(self.gitrepo) @@ -1511,7 +1511,7 @@ index 0000000..60f7480 # Test again after adding a comment # We need to make sure we wait for worker to commit the comment with patch('pagure.lib.git._maybe_wait', tests.definitely_wait): - msg = pagure.lib.query.add_issue_comment( + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='Hey look a comment!', @@ -1628,8 +1628,8 @@ index 458821a..77674a8 files = [entry.name for entry in commit.tree] self.assertEqual(files, [hash_file]) - repo = pagure.lib.query.get_authorized_project(self.session, 'test_ticket_repo') - issue = pagure.lib.query.search_issues(self.session, repo, issueid=1) + repo = retrieval_queries.get_authorized_project(self.session, 'test_ticket_repo') + issue = retrieval_queries.search_issues(self.session, repo, issueid=1) pagure.lib.git.clean_git(repo, issue.repotype, issue.uid).get() # No more files in the git repo @@ -1658,9 +1658,9 @@ index 458821a..77674a8 pygit2.init_repository(self.gitrepo, bare=True) # Create a PR to play with - repo = pagure.lib.query.get_authorized_project(self.session, 'test_ticket_repo') + repo = retrieval_queries.get_authorized_project(self.session, 'test_ticket_repo') # Create an issue to play with - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -1884,7 +1884,7 @@ index 0000000..60f7480 """ Test the update_ticket_from_git method from pagure.lib.git. """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Before self.assertEqual(len(repo.issues), 0) @@ -1961,7 +1961,7 @@ index 0000000..60f7480 """ Test the update_ticket_from_git method from pagure.lib.git. """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Before self.assertEqual(len(repo.issues), 0) @@ -2033,7 +2033,7 @@ index 0000000..60f7480 """ Test the update_ticket_from_git method from pagure.lib.git. """ tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Set some priorities to the project repo.priorities = {'1': 'High', '2': 'Normal'} self.session.add(repo) @@ -2184,8 +2184,8 @@ index 0000000..60f7480 tests.create_projects(self.session) tests.create_projects_git(os.path.join(self.path, 'repos')) - repo = pagure.lib.query._get_project(self.session, 'test') - namespaced_repo = pagure.lib.query._get_project(self.session, 'test3', namespace='somenamespace') + repo = retrieval_queries._get_project(self.session, 'test') + namespaced_repo = retrieval_queries._get_project(self.session, 'test3', namespace='somenamespace') # Before self.assertEqual(len(repo.requests), 0) @@ -2737,10 +2737,10 @@ index 0000000..60f7480 """ Test the update_custom_fields_from_json method of lib.git """ tests.create_projects(self.session) - repo = pagure.lib.query._get_project(self.session, 'test') + repo = retrieval_queries._get_project(self.session, 'test') # Create issues to play with - pagure.lib.query.new_issue( + retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -2750,7 +2750,7 @@ index 0000000..60f7480 ) self.session.commit() - issue = pagure.lib.query.get_issue_by_uid(self.session, 'someuid') + issue = retrieval_queries.get_issue_by_uid(self.session, 'someuid') # Fake json data, currently without custom_fields # This should bring no new custom_fields to the issue @@ -2775,7 +2775,7 @@ index 0000000..60f7480 pagure.lib.git.update_custom_field_from_json( self.session, repo, issue, json_data) - updated_issue = pagure.lib.query.get_issue_by_uid(self.session, 'someuid') + updated_issue = retrieval_queries.get_issue_by_uid(self.session, 'someuid') self.assertEqual(updated_issue.to_json().get('custom_fields'), []) custom_fields = [ @@ -2818,7 +2818,7 @@ index 0000000..60f7480 pagure.lib.git.update_custom_field_from_json( self.session, repo, issue, json_data) - updated_issue = pagure.lib.query.get_issue_by_uid(self.session, 'someuid') + updated_issue = retrieval_queries.get_issue_by_uid(self.session, 'someuid') custom_fields_of_issue = updated_issue.to_json().get('custom_fields') self.assertEqual(custom_fields_of_issue, custom_fields) @@ -2846,7 +2846,7 @@ index 0000000..60f7480 self.session.add(item) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') gitrepo = os.path.join(gitfolder, repo.path) docrepo = os.path.join(docfolder, repo.path) ticketrepo = os.path.join(ticketfolder, repo.path) @@ -2858,7 +2858,7 @@ index 0000000..60f7480 repo_obj = pygit2.init_repository(self.gitrepo, bare=True) # Fork the project - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=self.session, user='foo', repo=repo, @@ -2875,9 +2875,9 @@ index 0000000..60f7480 self.path, 'repos', 'forks', 'foo', 'test.git') tests.add_content_git_repo(self.gitrepo, branch='feature') - fork_repo = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + fork_repo = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') # Create a PR to play with - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=fork_repo, branch_from='feature', @@ -2925,7 +2925,7 @@ index 0000000..60f7480 self.session.add(item) self.session.commit() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') os.makedirs(os.path.join(self.path, 'repos', 'forks', 'foo')) self.gitrepo = os.path.join(self.path, 'repos', 'test.git') @@ -2934,7 +2934,7 @@ index 0000000..60f7480 tests.add_content_git_repo(self.gitrepo, branch='master') # Fork the project - task = pagure.lib.query.fork_project( + task = retrieval_queries.fork_project( session=self.session, user='foo', repo=repo, @@ -2951,9 +2951,9 @@ index 0000000..60f7480 self.path, 'repos', 'forks', 'foo', 'test.git') tests.add_content_git_repo(self.gitrepo, branch='feature') - fork_repo = pagure.lib.query.get_authorized_project(self.session, 'test', user='foo') + fork_repo = retrieval_queries.get_authorized_project(self.session, 'test', user='foo') # Create a PR to play with - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=fork_repo, branch_from='feature', diff --git a/tests/test_pagure_lib_git_auth.py b/tests/test_pagure_lib_git_auth.py index 62301e9..ee81254 100644 --- a/tests/test_pagure_lib_git_auth.py +++ b/tests/test_pagure_lib_git_auth.py @@ -31,7 +31,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.git -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -179,8 +179,8 @@ class PagureLibGitAuthtests(tests.Modeltests): self.assertEqual(output_text, 'foo\n bar\n baz') # Create the PRs - project = pagure.lib.query.get_authorized_project(self.session, 'hooktest') - req = pagure.lib.query.new_pull_request( + project = retrieval_queries.get_authorized_project(self.session, 'hooktest') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from="source", diff --git a/tests/test_pagure_lib_git_diff_pr.py b/tests/test_pagure_lib_git_diff_pr.py index 1b8d7e7..386e430 100644 --- a/tests/test_pagure_lib_git_diff_pr.py +++ b/tests/test_pagure_lib_git_diff_pr.py @@ -27,7 +27,7 @@ from mock import patch, MagicMock # noqa sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query # noqa +from pagure.lib import retrieval_queries # noqa import tests # noqa from pagure.lib.repo import PagureRepo # noqa @@ -210,11 +210,11 @@ class PagureFlaskForkPrtests(tests.Modeltests): shutil.rmtree(newpath) # Create the PR between the two repos - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project( self.session, 'test', user='pingou') - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='feature_foo', @@ -283,7 +283,7 @@ class PagureFlaskForkPrtests(tests.Modeltests): gitrepo = os.path.join(self.path, 'repos', 'test.git') gitrepo2 = os.path.join( self.path, 'repos', 'forks', 'pingou', 'test.git') - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, requestid=1, project_id=1) diff_commits, diff = pagure.lib.git.diff_pull_request( @@ -332,7 +332,7 @@ class PagureFlaskForkPrtests(tests.Modeltests): gitrepo = os.path.join(self.path, 'repos', 'test.git') gitrepo2 = os.path.join( self.path, 'repos', 'forks', 'pingou', 'test.git') - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, requestid=1, project_id=1) # Get the diff corresponding to the PR and check its ref @@ -445,7 +445,7 @@ class PagureFlaskForkPrtests(tests.Modeltests): gitrepo = os.path.join(self.path, 'repos', 'test.git') gitrepo2 = os.path.join( self.path, 'repos', 'forks', 'pingou', 'test.git') - request = pagure.lib.query.search_pull_requests( + request = retrieval_queries.search_pull_requests( self.session, requestid=1, project_id=1) # Get the diff corresponding to the PR and check its ref diff --git a/tests/test_pagure_lib_git_get_tags_objects.py b/tests/test_pagure_lib_git_get_tags_objects.py index 23ec107..8f8194b 100644 --- a/tests/test_pagure_lib_git_get_tags_objects.py +++ b/tests/test_pagure_lib_git_get_tags_objects.py @@ -21,7 +21,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.git -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -53,7 +53,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(self.path, 'repos'), bare=True) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') # Case 1 - Empty repo with no tags exp = [] @@ -78,7 +78,7 @@ class PagureLibGitGetTagstests(tests.Modeltests): self.assertEqual(exp, get_tag_name(tags)) # Case 4 - Sorting with different splitting characters - project = pagure.lib.query.get_authorized_project(self.session, 'test2') + project = retrieval_queries.get_authorized_project(self.session, 'test2') tests.add_readme_git_repo(os.path.join(os.path.join( self.path, 'repos'), 'test2.git')) repo = pygit2.Repository(os.path.join(os.path.join( diff --git a/tests/test_pagure_lib_gitolite_config.py b/tests/test_pagure_lib_gitolite_config.py index da4a106..6cc63a1 100644 --- a/tests/test_pagure_lib_gitolite_config.py +++ b/tests/test_pagure_lib_gitolite_config.py @@ -30,7 +30,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.git -import pagure.lib.query +from pagure.lib import retrieval_queries import tests from pagure.lib.repo import PagureRepo @@ -212,7 +212,7 @@ class PagureLibGitoliteConfigtests(tests.Modeltests): with open(self.outputconf, 'w') as stream: pass - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3') helper.write_gitolite_acls( @@ -264,13 +264,13 @@ repo requests/test self.test_write_gitolite_pre_post_project_1() self.assertTrue(os.path.exists(self.outputconf)) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') project.user_id = 2 self.session.add(project) self.session.commit() - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='pingou', @@ -280,7 +280,7 @@ repo requests/test self.assertEqual(msg, 'User added') self.session.commit() - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3') helper.write_gitolite_acls( self.session, @@ -362,13 +362,13 @@ repo requests/test are disabled """ # Re-generate the gitolite config for all the projects - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') project.user_id = 2 self.session.add(project) self.session.commit() - project = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='pingou', @@ -378,7 +378,7 @@ repo requests/test self.assertEqual(msg, 'User added') self.session.commit() - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3') helper.write_gitolite_acls( self.session, @@ -433,7 +433,7 @@ class PagureLibGitoliteGroupConfigtests(tests.Modeltests): tests.create_projects(self.session) - pagure.lib.query.add_group( + retrieval_queries.add_group( self.session, group_name='grp', display_name='grp group', @@ -443,7 +443,7 @@ class PagureLibGitoliteGroupConfigtests(tests.Modeltests): is_admin=False, blacklist=[], ) - pagure.lib.query.add_group( + retrieval_queries.add_group( self.session, group_name='grp2', display_name='grp2 group', @@ -484,8 +484,8 @@ class PagureLibGitoliteGroupConfigtests(tests.Modeltests): with open(self.outputconf, 'w') as stream: pass - project = pagure.lib.query._get_project(self.session, 'test') - group = pagure.lib.query.search_groups(self.session, group_name='grp') + project = retrieval_queries._get_project(self.session, 'test') + group = retrieval_queries.search_groups(self.session, group_name='grp') helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3') helper.write_gitolite_acls( @@ -538,7 +538,7 @@ repo requests/test with open(self.outputconf, 'w') as stream: pass - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3') helper.write_gitolite_acls( @@ -632,11 +632,11 @@ repo requests/test # Generate the full gitolite config that we will update self.test_write_gitolite_project_all_projects_groups() - project = pagure.lib.query._get_project(self.session, 'test') - group = pagure.lib.query.search_groups(self.session, group_name='grp') + project = retrieval_queries._get_project(self.session, 'test') + group = retrieval_queries.search_groups(self.session, group_name='grp') # Let's add `foo` to `grp` so something changes - msg = pagure.lib.query.add_user_to_group( + msg = retrieval_queries.add_user_to_group( self.session, username='foo', group=group, @@ -647,7 +647,7 @@ repo requests/test self.assertEqual(msg, 'User `foo` added to the group `grp`.') # Let's add `foo` to `test` so the project changes as well - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( self.session, project=project, new_user='foo', @@ -745,11 +745,11 @@ repo requests/test self.test_write_gitolite_project_all_projects_groups() # Delete the group `grp` - self.assertEqual(len(pagure.lib.query.search_groups(self.session)), 2) - group = pagure.lib.query.search_groups(self.session, group_name='grp') + self.assertEqual(len(retrieval_queries.search_groups(self.session)), 2) + group = retrieval_queries.search_groups(self.session, group_name='grp') self.session.delete(group) self.session.commit() - self.assertEqual(len(pagure.lib.query.search_groups(self.session)), 1) + self.assertEqual(len(retrieval_queries.search_groups(self.session)), 1) helper = pagure.lib.git_auth.get_git_auth_helper('gitolite3') helper.write_gitolite_acls( @@ -790,7 +790,7 @@ repo requests/test then None is passed to the helper. """ helper = MagicMock() get_helper.return_value = helper - pagure.lib.query.SESSIONMAKER = self.session.session_factory + retrieval_queries.SESSIONMAKER = self.session.session_factory pagure.lib.tasks.generate_gitolite_acls( namespace=None, name='test', user=None, group=None) @@ -805,7 +805,7 @@ repo requests/test a postconf set """ # Make the test project private - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') project.private = True self.session.add(project) self.session.commit() @@ -903,7 +903,7 @@ repo requests/somenamespace/test3 self.assertEqual(data, exp) # Test removing a project from the existing config - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, project_name='test') helper.remove_acls(self.session, project=project) diff --git a/tests/test_pagure_lib_link.py b/tests/test_pagure_lib_link.py index d5e7b35..33072a8 100644 --- a/tests/test_pagure_lib_link.py +++ b/tests/test_pagure_lib_link.py @@ -26,7 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.link -import pagure.lib.query +from pagure.lib import retrieval_queries import tests COMMENTS = [ @@ -69,8 +69,8 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_issue( self.session, repo, title='foo', @@ -106,8 +106,8 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_issue( self.session, repo, title='another foo', @@ -163,8 +163,8 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - pagure.lib.query.new_issue( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + retrieval_queries.new_issue( self.session, repo, title='issue 3', diff --git a/tests/test_pagure_lib_model.py b/tests/test_pagure_lib_model.py index f00e2ad..60dc3f3 100644 --- a/tests/test_pagure_lib_model.py +++ b/tests/test_pagure_lib_model.py @@ -23,7 +23,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.model -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -32,7 +32,7 @@ class PagureLibModeltests(tests.Modeltests): def test_user__repr__(self): """ Test the User.__repr__ function of pagure.lib.model. """ - item = pagure.lib.query.search_user(self.session, email='foo@bar.com') + item = retrieval_queries.search_user(self.session, email='foo@bar.com') self.assertEqual(str(item), 'User: 2 - name foo') self.assertEqual('foo', item.user) self.assertEqual('foo', item.username) @@ -46,10 +46,10 @@ class PagureLibModeltests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') + repo = retrieval_queries.get_authorized_project(self.session, 'test') # Create an issue - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=repo, title='Test issue', @@ -58,7 +58,7 @@ class PagureLibModeltests(tests.Modeltests): ) self.assertEqual(msg.title, 'Test issue') - issues = pagure.lib.query.search_issues(self.session, repo) + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 1) self.assertEqual( str(issues[0]), @@ -84,12 +84,12 @@ class PagureLibModeltests(tests.Modeltests): self.session.commit() self.session.add(item) - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - forked_repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + forked_repo = retrieval_queries.get_authorized_project( self.session, 'test', user='pingou') # Create an pull-request - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -106,7 +106,7 @@ class PagureLibModeltests(tests.Modeltests): 'PullRequest(1, project:test, user:pingou, ' 'title:test pull-request)') - request = pagure.lib.query.search_pull_requests(self.session, requestid=1) + request = retrieval_queries.search_pull_requests(self.session, requestid=1) self.assertEqual( str(request), 'PullRequest(1, project:test, user:pingou, ' @@ -128,8 +128,8 @@ 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.query.get_authorized_project(self.session, 'test') - issues = pagure.lib.query.search_issues(self.session, repo) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 1) item = pagure.lib.model.Tag(tag='foo') @@ -147,8 +147,8 @@ class PagureLibModeltests(tests.Modeltests): def test_tagissuecolor__repr__(self): """ Test the TagIssue.__repr__ function of pagure.lib.model. """ self.test_issue__repr__() - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - issues = pagure.lib.query.search_issues(self.session, repo) + repo = retrieval_queries.get_authorized_project(self.session, 'test') + issues = retrieval_queries.search_issues(self.session, repo) self.assertEqual(len(issues), 1) item = pagure.lib.model.TagColored( @@ -218,9 +218,9 @@ class PagureLibModeltests(tests.Modeltests): for ns, reponame in [ (None, 'aaa'), (None, 'KKK'), ('somenamespace', 'zzz')]: - repo = pagure.lib.query.get_authorized_project( + repo = retrieval_queries.get_authorized_project( self.session, reponame, namespace=ns) - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( self.session, project=repo, new_group='testgrp', @@ -232,7 +232,7 @@ class PagureLibModeltests(tests.Modeltests): self.assertEqual(msg, 'Group added') # Check the ordering - group = pagure.lib.query.search_groups(self.session, group_name='testgrp') + group = retrieval_queries.search_groups(self.session, group_name='testgrp') # Default PostgreSQL order order = ['aaa', 'KKK', 'somenamespace/zzz'] # Odd, SQLite order diff --git a/tests/test_pagure_lib_model_delete_project.py b/tests/test_pagure_lib_model_delete_project.py index 91fb4a4..501e82a 100644 --- a/tests/test_pagure_lib_model_delete_project.py +++ b/tests/test_pagure_lib_model_delete_project.py @@ -24,7 +24,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.model as model -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -204,7 +204,7 @@ class DeleteProjectTests(tests.Modeltests): # Create issues issue = model.Issue( - id=pagure.lib.query.get_next_id(self.session, 1), + id=retrieval_queries.get_next_id(self.session, 1), project_id=1, title='Issue #1', content='Description #1', @@ -216,7 +216,7 @@ class DeleteProjectTests(tests.Modeltests): self.session.commit() issue = model.Issue( - id=pagure.lib.query.get_next_id(self.session, 1), + id=retrieval_queries.get_next_id(self.session, 1), project_id=1, title='Issue #2', content='Description #2', @@ -280,7 +280,7 @@ class DeleteProjectTests(tests.Modeltests): # Create issues issue = model.Issue( - id=pagure.lib.query.get_next_id(self.session, 1), + id=retrieval_queries.get_next_id(self.session, 1), project_id=1, title='Issue #1', content='Description #1', @@ -292,7 +292,7 @@ class DeleteProjectTests(tests.Modeltests): self.session.commit() issue = model.Issue( - id=pagure.lib.query.get_next_id(self.session, 1), + id=retrieval_queries.get_next_id(self.session, 1), project_id=1, title='Issue #2', content='Description #2', diff --git a/tests/test_pagure_lib_notify.py b/tests/test_pagure_lib_notify.py index 4ec6cca..133ecb4 100644 --- a/tests/test_pagure_lib_notify.py +++ b/tests/test_pagure_lib_notify.py @@ -25,7 +25,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib.model import pagure.lib.notify -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -50,7 +50,7 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=item, @@ -67,7 +67,7 @@ class PagureLibNotifytests(tests.Modeltests): self.assertEqual(out, exp) # Comment on the ticket - out = pagure.lib.query.add_issue_comment( + out = retrieval_queries.add_issue_comment( self.session, issue=iss, comment='This is a comment', @@ -94,7 +94,7 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Watch the ticket - out = pagure.lib.query.set_watch_obj(self.session, 'bar', iss, True) + out = retrieval_queries.set_watch_obj(self.session, 'bar', iss, True) self.assertEqual(out, 'You are now watching this issue') exp = set(['bar@pingou.com', 'foo@bar.com', 'bar@bar.com']) @@ -117,7 +117,7 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=item, @@ -134,7 +134,7 @@ class PagureLibNotifytests(tests.Modeltests): self.assertEqual(out, exp) # Comment on the ticket - out = pagure.lib.query.add_issue_comment( + out = retrieval_queries.add_issue_comment( self.session, issue=iss, comment='This is a comment', @@ -161,8 +161,8 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Watch the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test3', namespace='ns') - out = pagure.lib.query.update_watch_status(self.session, repo, 'bar', '1') + repo = retrieval_queries.get_authorized_project(self.session, 'test3', namespace='ns') + out = retrieval_queries.update_watch_status(self.session, repo, 'bar', '1') self.assertEqual( out, 'You are now watching issues and PRs on this project') @@ -190,8 +190,8 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Create the PR - repo = pagure.lib.query._get_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries._get_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='master', @@ -210,7 +210,7 @@ class PagureLibNotifytests(tests.Modeltests): self.assertEqual(out, exp) # Comment on the ticket - out = pagure.lib.query.add_pull_request_comment( + out = retrieval_queries.add_pull_request_comment( self.session, request=req, commit=None, @@ -241,7 +241,7 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Watch the pull-request - out = pagure.lib.query.set_watch_obj(self.session, 'bar', req, True) + out = retrieval_queries.set_watch_obj(self.session, 'bar', req, True) self.assertEqual(out, 'You are now watching this pull-request') exp = set(['bar@pingou.com', 'foo@bar.com', 'bar@bar.com']) @@ -268,8 +268,8 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Create the PR - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - req = pagure.lib.query.new_pull_request( + repo = retrieval_queries.get_authorized_project(self.session, 'test') + req = retrieval_queries.new_pull_request( session=self.session, repo_from=repo, branch_from='master', @@ -288,7 +288,7 @@ class PagureLibNotifytests(tests.Modeltests): self.assertEqual(out, exp) # Comment on the ticket - out = pagure.lib.query.add_pull_request_comment( + out = retrieval_queries.add_pull_request_comment( self.session, request=req, commit=None, @@ -319,8 +319,8 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Watch the project - repo = pagure.lib.query.get_authorized_project(self.session, 'test') - out = pagure.lib.query.update_watch_status(self.session, repo, 'bar', '1') + repo = retrieval_queries.get_authorized_project(self.session, 'test') + out = retrieval_queries.update_watch_status(self.session, repo, 'bar', '1') self.assertEqual( out, 'You are now watching issues and PRs on this project') @@ -344,7 +344,7 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Create the private ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=item, @@ -362,7 +362,7 @@ class PagureLibNotifytests(tests.Modeltests): self.assertEqual(out, exp) # Comment on the ticket - out = pagure.lib.query.add_issue_comment( + out = retrieval_queries.add_issue_comment( self.session, issue=iss, comment='This is a comment', @@ -389,8 +389,8 @@ class PagureLibNotifytests(tests.Modeltests): self.session.commit() # Add bar on the project with ticket acl - project = pagure.lib.query._get_project(self.session, 'test3', namespace='ns') - msg = pagure.lib.query.add_user_to_project( + project = retrieval_queries._get_project(self.session, 'test3', namespace='ns') + msg = retrieval_queries.add_user_to_project( session=self.session, project=project, new_user='bar', diff --git a/tests/test_pagure_lib_notify_email.py b/tests/test_pagure_lib_notify_email.py index 377ff42..cc11447 100644 --- a/tests/test_pagure_lib_notify_email.py +++ b/tests/test_pagure_lib_notify_email.py @@ -20,7 +20,7 @@ import six sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query # pylint: disable=wrong-import-position +from pagure.lib import retrieval_queries # pylint: disable=wrong-import-position import pagure.lib.model # pylint: disable=wrong-import-position import pagure.lib.notify # pylint: disable=wrong-import-position import tests # pylint: disable=wrong-import-position @@ -41,11 +41,11 @@ class PagureLibNotifyEmailtests(tests.Modeltests): patcher = mock.patch('pagure.lib.notify.send_email') patcher.start() - self.user1 = pagure.lib.query.get_user(self.session, 'pingou') - self.user2 = pagure.lib.query.get_user(self.session, 'foo') - self.project1 = pagure.lib.query._get_project(self.session, 'test') - self.project2 = pagure.lib.query._get_project(self.session, 'test2') - self.project3 = pagure.lib.query._get_project(self.session, 'test3', namespace='somenamespace') + self.user1 = retrieval_queries.get_user(self.session, 'pingou') + self.user2 = retrieval_queries.get_user(self.session, 'foo') + self.project1 = retrieval_queries._get_project(self.session, 'test') + self.project2 = retrieval_queries._get_project(self.session, 'test2') + self.project3 = retrieval_queries._get_project(self.session, 'test3', namespace='somenamespace') # Create a forked repo, should be project #4 # Not using fork_project as it tries to do a git clone @@ -59,10 +59,10 @@ class PagureLibNotifyEmailtests(tests.Modeltests): ) self.session.add(item) self.session.commit() - self.forkedproject = pagure.lib.query._get_project(self.session, 'test', user='foo') + self.forkedproject = retrieval_queries._get_project(self.session, 'test', user='foo') # Report an issue on project #1 - self.issue1 = pagure.lib.query.new_issue( + self.issue1 = retrieval_queries.new_issue( session=self.session, repo=self.project1, title='issue', @@ -71,16 +71,16 @@ class PagureLibNotifyEmailtests(tests.Modeltests): ) # Add a comment on the issue - pagure.lib.query.add_issue_comment( + retrieval_queries.add_issue_comment( self.session, self.issue1, comment='Test comment', user='pingou', ) - self.comment1 = pagure.lib.query.get_issue_comment(self.session, self.issue1.uid, 1) + self.comment1 = retrieval_queries.get_issue_comment(self.session, self.issue1.uid, 1) # Report an issue on project #3 (namespaced) - self.issue2 = pagure.lib.query.new_issue( + self.issue2 = retrieval_queries.new_issue( session=self.session, repo=self.project3, title='namespaced project issue', @@ -89,7 +89,7 @@ class PagureLibNotifyEmailtests(tests.Modeltests): ) # report an issue on foo's fork of project #1 - self.issue3 = pagure.lib.query.new_issue( + self.issue3 = retrieval_queries.new_issue( session=self.session, repo=self.forkedproject, title='forked project issue', diff --git a/tests/test_pagure_lib_plugins.py b/tests/test_pagure_lib_plugins.py index b6a174b..cec0875 100644 --- a/tests/test_pagure_lib_plugins.py +++ b/tests/test_pagure_lib_plugins.py @@ -49,7 +49,7 @@ class PagureLibtests_plugins(tests.Modeltests): handled by pagure.lib.plugins.get_enabled_plugins. """ tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, "test") + project = retrieval_queries._get_project(self.session, "test") load.return_value = [EnabledForAll] self.assertEqual( diff --git a/tests/test_pagure_lib_star_project.py b/tests/test_pagure_lib_star_project.py index 3150b8a..afe5d8d 100644 --- a/tests/test_pagure_lib_star_project.py +++ b/tests/test_pagure_lib_star_project.py @@ -21,7 +21,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.model -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @@ -36,9 +36,9 @@ class TestStarProjectLib(tests.SimplePagureTest): def test_update_star_project(self): ''' Test the update_star_project endpoint of pagure.lib ''' - repo_obj = pagure.lib.query._get_project(self.session, 'test') + repo_obj = retrieval_queries._get_project(self.session, 'test') # test with invalud Star object, should return None - msg = pagure.lib.query.update_star_project( + msg = retrieval_queries.update_star_project( self.session, repo_obj, None, @@ -46,12 +46,12 @@ class TestStarProjectLib(tests.SimplePagureTest): ) self.session.commit() self.assertEqual(msg, None) - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 0) # test starring the project - repo_obj = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.update_star_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.update_star_project( self.session, repo_obj, '1', @@ -60,12 +60,12 @@ class TestStarProjectLib(tests.SimplePagureTest): self.session.commit() self.assertEqual(msg, 'You starred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 1) # test unstarring the project - repo_obj = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query.update_star_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries.update_star_project( self.session, repo_obj, '0', @@ -74,16 +74,16 @@ class TestStarProjectLib(tests.SimplePagureTest): self.session.commit() self.assertEqual(msg, 'You unstarred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 0) def test_star_project(self): ''' Test the _star_project endpoint of pagure.lib ''' # test with not all arguments present - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - repo_obj = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query._star_project( + user_obj = retrieval_queries.get_user(self.session, 'pingou') + repo_obj = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries._star_project( self.session, repo_obj, None @@ -91,25 +91,25 @@ class TestStarProjectLib(tests.SimplePagureTest): self.session.commit() self.assertEqual(msg, None) - repo_obj = pagure.lib.query._get_project(self.session, 'test') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query._star_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + user_obj = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries._star_project( self.session, repo_obj, user_obj, ) self.session.commit() self.assertEqual(msg, 'You starred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 1) def test_unstar_project(self): ''' Test the _unstar_project endpoint of pagure.lib ''' # test with not all arguments present - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - repo_obj = pagure.lib.query._get_project(self.session, 'test') - msg = pagure.lib.query._unstar_project( + user_obj = retrieval_queries.get_user(self.session, 'pingou') + repo_obj = retrieval_queries._get_project(self.session, 'test') + msg = retrieval_queries._unstar_project( self.session, repo_obj, None @@ -118,60 +118,60 @@ class TestStarProjectLib(tests.SimplePagureTest): self.assertEqual(msg, None) # the user hasn't starred the project before - repo_obj = pagure.lib.query._get_project(self.session, 'test') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query._unstar_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + user_obj = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries._unstar_project( self.session, repo_obj, user_obj, ) self.assertEqual(msg, 'You never starred the project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 0) # star it for testing - msg = pagure.lib.query._star_project( + msg = retrieval_queries._star_project( self.session, repo_obj, user_obj, ) self.session.commit() self.assertEqual(msg, 'You starred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 1) # the user starred and wishes to unstar - repo_obj = pagure.lib.query._get_project(self.session, 'test') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query._unstar_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + user_obj = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries._unstar_project( self.session, repo_obj, user_obj, ) self.session.commit() self.assertEqual(msg, 'You unstarred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 0) def test_get_stargazer_obj(self): ''' Test the _get_stargazer_obj test of pagure.lib ''' # star the project first - repo_obj = pagure.lib.query._get_project(self.session, 'test') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query._star_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + user_obj = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries._star_project( self.session, repo_obj, user_obj, ) self.session.commit() self.assertEqual(msg, 'You starred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 1) # get the object now - repo_obj = pagure.lib.query._get_project(self.session, 'test') - star_obj = pagure.lib.query._get_stargazer_obj( + repo_obj = retrieval_queries._get_project(self.session, 'test') + star_obj = retrieval_queries._get_stargazer_obj( self.session, repo_obj, user_obj @@ -179,22 +179,22 @@ class TestStarProjectLib(tests.SimplePagureTest): self.assertEqual(isinstance(star_obj, pagure.lib.model.Star), True) # unstar it and then try to get the object - repo_obj = pagure.lib.query._get_project(self.session, 'test') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query._unstar_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + user_obj = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries._unstar_project( self.session, repo_obj, user_obj, ) self.session.commit() self.assertEqual(msg, 'You unstarred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 0) # we don't store if the user has unstarred, we delete the obj # so, we should get anything back in the query - repo_obj = pagure.lib.query._get_project(self.session, 'test') - star_obj = pagure.lib.query._get_stargazer_obj( + repo_obj = retrieval_queries._get_project(self.session, 'test') + star_obj = retrieval_queries._get_stargazer_obj( self.session, repo_obj, user_obj @@ -205,19 +205,19 @@ class TestStarProjectLib(tests.SimplePagureTest): ''' Test the has_starred endpoint of pagure.lib ''' # star the project - repo_obj = pagure.lib.query._get_project(self.session, 'test') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query._star_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + user_obj = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries._star_project( self.session, repo_obj, user_obj, ) self.session.commit() self.assertEqual(msg, 'You starred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 1) - has_starred = pagure.lib.query.has_starred( + has_starred = retrieval_queries.has_starred( self.session, repo_obj, 'pingou' @@ -225,20 +225,20 @@ class TestStarProjectLib(tests.SimplePagureTest): self.assertEqual(has_starred is True, True) # unstar it and then test for has_starred - repo_obj = pagure.lib.query._get_project(self.session, 'test') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') - msg = pagure.lib.query._unstar_project( + repo_obj = retrieval_queries._get_project(self.session, 'test') + user_obj = retrieval_queries.get_user(self.session, 'pingou') + msg = retrieval_queries._unstar_project( self.session, repo_obj, user_obj, ) self.session.commit() self.assertEqual(msg, 'You unstarred this project') - user_obj = pagure.lib.query.get_user(self.session, 'pingou') + user_obj = retrieval_queries.get_user(self.session, 'pingou') self.assertEqual(len(user_obj.stars), 0) # check now, it should return False - has_starred = pagure.lib.query.has_starred( + has_starred = retrieval_queries.has_starred( self.session, repo_obj, 'pingou' diff --git a/tests/test_pagure_lib_task_mirror.py b/tests/test_pagure_lib_task_mirror.py index 1751eab..13f2826 100644 --- a/tests/test_pagure_lib_task_mirror.py +++ b/tests/test_pagure_lib_task_mirror.py @@ -26,7 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.plugins -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.lib.tasks_mirror import tests @@ -69,7 +69,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): # before self.assertFalse(os.path.exists(self.sshkeydir)) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook) # Install the plugin at the DB level @@ -89,7 +89,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): sorted(os.listdir(self.sshkeydir)), [u'test', u'test.pub'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNotNone(project.mirror_hook.public_key) self.assertTrue( project.mirror_hook.public_key.startswith('ssh-rsa ')) @@ -101,7 +101,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): # before self.assertEqual(sorted(os.listdir(self.sshkeydir)), []) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook) # Install the plugin at the DB level @@ -120,7 +120,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): # after self.assertEqual(sorted(os.listdir(self.sshkeydir)), []) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook.public_key) def test_setup_mirroring_ssh_folder_symlink(self): @@ -137,7 +137,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): [u'attachments', u'config', u'forks', u'releases', u'remotes', u'repos', u'sshkeys'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook) # Install the plugin at the DB level @@ -160,7 +160,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): [u'attachments', u'config', u'forks', u'releases', u'remotes', u'repos', u'sshkeys'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook.public_key) @patch('os.getuid', MagicMock(return_value=450)) @@ -170,7 +170,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): # before self.assertEqual(sorted(os.listdir(self.sshkeydir)), []) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook) # Install the plugin at the DB level @@ -189,7 +189,7 @@ class PagureLibTaskMirrortests(tests.Modeltests): # after self.assertEqual(sorted(os.listdir(self.sshkeydir)), []) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook.public_key) @@ -207,7 +207,7 @@ class PagureLibTaskMirrorSetuptests(tests.Modeltests): pagure.config.config['MIRROR_SSHKEYS_FOLDER'] = self.sshkeydir tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') # Install the plugin at the DB level plugin = pagure.lib.plugins.get_plugin('Mirroring') @@ -229,7 +229,7 @@ class PagureLibTaskMirrorSetuptests(tests.Modeltests): self.assertEqual( sorted(os.listdir(self.sshkeydir)), [u'test', u'test.pub'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNotNone(project.mirror_hook.public_key) before_key = project.mirror_hook.public_key self.assertTrue( @@ -247,7 +247,7 @@ class PagureLibTaskMirrorSetuptests(tests.Modeltests): sorted(os.listdir(self.sshkeydir)), [u'test', u'test.pub'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNotNone(project.mirror_hook.public_key) self.assertEqual(project.mirror_hook.public_key, before_key) @@ -258,7 +258,7 @@ class PagureLibTaskMirrorSetuptests(tests.Modeltests): self.assertEqual( sorted(os.listdir(self.sshkeydir)), [u'test', u'test.pub'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNotNone(project.mirror_hook.public_key) self.assertTrue( project.mirror_hook.public_key.startswith('ssh-rsa ')) @@ -269,9 +269,9 @@ class PagureLibTaskMirrorSetuptests(tests.Modeltests): name='test') # after - self.session = pagure.lib.query.create_session(self.dbpath) + self.session = retrieval_queries.create_session(self.dbpath) self.assertEqual(sorted(os.listdir(self.sshkeydir)), []) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNone(project.mirror_hook.public_key) @patch('pagure.lib.git.read_git_lines') @@ -285,7 +285,7 @@ class PagureLibTaskMirrorSetuptests(tests.Modeltests): self.assertEqual( sorted(os.listdir(self.sshkeydir)), [u'test', u'test.pub'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNotNone(project.mirror_hook.public_key) self.assertTrue( project.mirror_hook.public_key.startswith('ssh-rsa ')) @@ -300,7 +300,7 @@ class PagureLibTaskMirrorSetuptests(tests.Modeltests): sorted(os.listdir(self.sshkeydir)), [u'test', u'test.pub'] ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') self.assertIsNotNone(project.mirror_hook.public_key) self.assertTrue( project.mirror_hook.public_key.startswith('ssh-rsa ')) diff --git a/tests/test_pagure_lib_task_services.py b/tests/test_pagure_lib_task_services.py index 3060811..41028ca 100644 --- a/tests/test_pagure_lib_task_services.py +++ b/tests/test_pagure_lib_task_services.py @@ -26,7 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.tasks_services -import pagure.lib.query +from pagure.lib import retrieval_queries import tests import pagure.lib.tasks_services @@ -150,7 +150,7 @@ class PagureLibTaskServicestests(tests.Modeltests): ci_type='jenkins') trigger_jenk.assert_not_called() - @patch('pagure.lib.query._get_project') + @patch('retrieval_queries._get_project') def test_load_json_commits_to_db_invalid_data_type(self, get_project): """ Test the load_json_commits_to_db method. """ output = pagure.lib.tasks_services.load_json_commits_to_db( @@ -402,7 +402,7 @@ class PagureLibTaskServicesWithWebHooktests(tests.Modeltests): pagure.config.config['MIRROR_SSHKEYS_FOLDER'] = self.sshkeydir tests.create_projects(self.session) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') settings = project.settings settings['Web-hooks'] = 'http://foo.com/api/flag\nhttp://bar.org/bar' project.settings = settings @@ -421,7 +421,7 @@ class PagureLibTaskServicesWithWebHooktests(tests.Modeltests): user=None) self.assertIsNone(output) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') call_wh.assert_called_once_with( ANY, u'topic', {u'payload': [u'a', u'b', u'c']}, [u'http://foo.com/api/flag', u'http://bar.org/bar'] @@ -442,7 +442,7 @@ class PagureLibTaskServicesWithWebHooktests(tests.Modeltests): user=None) self.assertIsNone(output) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') self.assertEqual(post.call_count, 2) calls = [ @@ -518,7 +518,7 @@ class PagureLibTaskServicesJenkinsCItests(tests.Modeltests): pagure.config.config['MIRROR_SSHKEYS_FOLDER'] = self.sshkeydir tests.create_projects(self.session) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') # Install the plugin at the DB level plugin = pagure.lib.plugins.get_plugin('Pagure CI') @@ -618,9 +618,9 @@ class PagureLibTaskServicesLoadJsonTickettests(tests.Modeltests): os.makedirs(self.gitrepo) self.repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - project = pagure.lib.query.get_authorized_project(self.session, 'test') + project = retrieval_queries.get_authorized_project(self.session, 'test') # Create an issue to play with - msg = pagure.lib.query.new_issue( + msg = retrieval_queries.new_issue( session=self.session, repo=project, title='Test issue', @@ -629,10 +629,10 @@ class PagureLibTaskServicesLoadJsonTickettests(tests.Modeltests): ) self.assertEqual(msg.title, 'Test issue') - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + issue = retrieval_queries.search_issues(self.session, project, issueid=1) # Add a couple of comment on the ticket - msg = pagure.lib.query.add_issue_comment( + msg = retrieval_queries.add_issue_comment( session=self.session, issue=issue, comment='Hey look a comment!', @@ -649,15 +649,15 @@ class PagureLibTaskServicesLoadJsonTickettests(tests.Modeltests): # 2 commits: creation - new comment self.assertEqual(len(commits), 2) - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + issue = retrieval_queries.search_issues(self.session, project, issueid=1) self.assertEqual(len(issue.comments), 1) @patch('pagure.lib.notify.send_email') @patch('pagure.lib.git.update_request_from_git') def test_loading_issue_json(self, up_pr, send): """ Test loading the JSON file of a ticket. """ - project = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + project = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, project, issueid=1) commits = [ commit.oid.hex @@ -688,8 +688,8 @@ class PagureLibTaskServicesLoadJsonTickettests(tests.Modeltests): send.mock_calls ) - project = pagure.lib.query.get_authorized_project(self.session, 'test') - issue = pagure.lib.query.search_issues(self.session, project, issueid=1) + project = retrieval_queries.get_authorized_project(self.session, 'test') + issue = retrieval_queries.search_issues(self.session, project, issueid=1) self.assertEqual(len(issue.comments), 1) diff --git a/tests/test_pagure_lib_watch_list.py b/tests/test_pagure_lib_watch_list.py index b351495..97dec75 100644 --- a/tests/test_pagure_lib_watch_list.py +++ b/tests/test_pagure_lib_watch_list.py @@ -24,7 +24,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.model -import pagure.lib.query +from pagure.lib import retrieval_queries import tests @mock.patch( @@ -32,7 +32,7 @@ import tests @mock.patch( 'pagure.lib.notify.send_email', mock.MagicMock(return_value=True)) class PagureLibGetWatchListtests(tests.Modeltests): - """ Tests for pagure.lib.query.get_watch_list """ + """ Tests for retrieval_queries.get_watch_list """ def test_get_watch_list_invalid_object(self): """ Test get_watch_list when given an invalid object """ @@ -50,7 +50,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertRaises( pagure.exceptions.InvalidObjectException, - pagure.lib.query.get_watch_list, + retrieval_queries.get_watch_list, self.session, item ) @@ -71,7 +71,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.commit() # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=item, @@ -84,7 +84,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['pingou']) ) @@ -104,7 +104,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.commit() # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=item, @@ -117,7 +117,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['pingou', 'foo']) ) @@ -149,9 +149,9 @@ class PagureLibGetWatchListtests(tests.Modeltests): email='bar@bar.com') self.session.add(item) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( self.session, 'test3', namespace='ns') - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=project, new_user='bar', @@ -161,7 +161,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(msg, 'User added') # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=project, @@ -174,7 +174,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['pingou', 'foo', 'bar']) ) @@ -207,7 +207,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.add(item) # Create a group - msg = pagure.lib.query.add_group( + msg = retrieval_queries.add_group( self.session, group_name='foo', display_name='foo group', @@ -221,8 +221,8 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(msg, 'User `pingou` added to the group `foo`.') # Add user to group - group = pagure.lib.query.search_groups(self.session, group_name='foo') - msg = pagure.lib.query.add_user_to_group( + group = retrieval_queries.search_groups(self.session, group_name='foo') + msg = retrieval_queries.add_user_to_group( self.session, username='bar', group=group, @@ -232,11 +232,11 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User `bar` added to the group `foo`.') - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( self.session, 'test3', namespace='ns') # Add group to project - msg = pagure.lib.query.add_group_to_project( + msg = retrieval_queries.add_group_to_project( session=self.session, project=project, new_group='foo', @@ -246,7 +246,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(msg, 'Group added') # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=project, @@ -259,7 +259,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['pingou', 'foo', 'bar']) ) @@ -291,9 +291,9 @@ class PagureLibGetWatchListtests(tests.Modeltests): email='bar@bar.com') self.session.add(item) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( self.session, 'test3', namespace='ns') - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=project, new_user='bar', @@ -303,7 +303,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(msg, 'User added') # Set the user `pingou` to not watch the project - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='pingou', @@ -313,7 +313,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(msg, 'You are no longer watching this project') # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=project, @@ -326,7 +326,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['foo', 'bar']) ) @@ -358,9 +358,9 @@ class PagureLibGetWatchListtests(tests.Modeltests): email='bar@bar.com') self.session.add(item) - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( self.session, 'test3', namespace='ns') - msg = pagure.lib.query.add_user_to_project( + msg = retrieval_queries.add_user_to_project( session=self.session, project=project, new_user='bar', @@ -370,7 +370,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(msg, 'User added') # Create the pull-request - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='dev', @@ -384,12 +384,12 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(req.title, 'test pull-request') # Set the user `pingou` to not watch the pull-request - out = pagure.lib.query.set_watch_obj(self.session, 'pingou', req, False) + out = retrieval_queries.set_watch_obj(self.session, 'pingou', req, False) self.assertEqual( out, 'You are no longer watching this pull-request') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, req), + retrieval_queries.get_watch_list(self.session, req), set(['foo', 'bar']) ) @@ -422,9 +422,9 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.add(item) # Set the user `bar` to watch the project - project = pagure.lib.query._get_project( + project = retrieval_queries._get_project( self.session, 'test3', namespace='ns') - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='bar', @@ -435,7 +435,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): msg, 'You are now watching issues and PRs on this project') # Create the pull-request - req = pagure.lib.query.new_pull_request( + req = retrieval_queries.new_pull_request( session=self.session, repo_from=project, branch_from='dev', @@ -449,7 +449,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(req.title, 'test pull-request') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, req), + retrieval_queries.get_watch_list(self.session, req), set(['foo', 'bar', 'pingou']) ) @@ -483,9 +483,9 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.session.add(item) # Set the user `bar` to watch the project - project = pagure.lib.query.get_authorized_project( + project = retrieval_queries.get_authorized_project( self.session, 'test3', namespace='ns') - msg = pagure.lib.query.update_watch_status( + msg = retrieval_queries.update_watch_status( session=self.session, project=project, user='bar', @@ -496,7 +496,7 @@ class PagureLibGetWatchListtests(tests.Modeltests): msg, 'You are now watching issues and PRs on this project') # Create the ticket - iss = pagure.lib.query.new_issue( + iss = retrieval_queries.new_issue( issue_id=4, session=self.session, repo=project, @@ -510,20 +510,20 @@ class PagureLibGetWatchListtests(tests.Modeltests): self.assertEqual(iss.title, 'test issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['pingou']) ) - out = pagure.lib.query.set_watch_obj(self.session, 'foo', iss, True) + out = retrieval_queries.set_watch_obj(self.session, 'foo', iss, True) self.assertEqual(out, 'You are now watching this issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['pingou','foo']) ) - out = pagure.lib.query.set_watch_obj(self.session, 'foo', iss, False) + out = retrieval_queries.set_watch_obj(self.session, 'foo', iss, False) self.assertEqual( out, 'You are no longer watching this issue') self.assertEqual( - pagure.lib.query.get_watch_list(self.session, iss), + retrieval_queries.get_watch_list(self.session, iss), set(['pingou']) ) diff --git a/tests/test_pagure_repospanner.py b/tests/test_pagure_repospanner.py index d8f288a..48df861 100644 --- a/tests/test_pagure_repospanner.py +++ b/tests/test_pagure_repospanner.py @@ -34,7 +34,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.cli.admin import tests @@ -324,7 +324,7 @@ class PagureRepoSpannerTestsNewRepoDefault(PagureRepoSpannerTests): self.create_project_full('clonetest', {"create_readme": "y"}) # Verify the new project is indeed on repoSpanner - project = pagure.lib.query._get_project(self.session, 'clonetest') + project = retrieval_queries._get_project(self.session, 'clonetest') self.assertTrue(project.is_on_repospanner) # Unfortunately, actually testing a git clone would need the app to @@ -357,7 +357,7 @@ class PagureRepoSpannerTestsNewRepoDefault(PagureRepoSpannerTests): self.create_project_full('clonetest', {"create_readme": "y"}) # Verify the new project is indeed on repoSpanner - project = pagure.lib.query._get_project(self.session, 'clonetest') + project = retrieval_queries._get_project(self.session, 'clonetest') self.assertTrue(project.is_on_repospanner) # Unfortunately, actually testing a git clone would need the app to @@ -517,7 +517,7 @@ class PagureRepoSpannerTestsNewRepoDefault(PagureRepoSpannerTests): output.get_data(as_text=True)) # Delete the project instance so that the actual repo remains - project = pagure.lib.query._get_project(self.session, 'project-1') + project = retrieval_queries._get_project(self.session, 'project-1') self.session.delete(project) self.session.commit() shutil.rmtree(os.path.join(self.path, 'repos', 'pseudo')) diff --git a/tests/test_pagure_utils.py b/tests/test_pagure_utils.py index b9045b1..d9aac29 100644 --- a/tests/test_pagure_utils.py +++ b/tests/test_pagure_utils.py @@ -27,7 +27,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) import pagure.lib.model -import pagure.lib.query +from pagure.lib import retrieval_queries import pagure.utils import tests @@ -43,7 +43,7 @@ class PagureUtilsTests(tests.SimplePagureTest): tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True) tests.add_content_git_repo(os.path.join(self.path, 'repos', 'test2.git')) - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') # Add a deploy key to the project new_key_obj = pagure.lib.model.SSHKey( project_id=project.id, @@ -59,25 +59,25 @@ class PagureUtilsTests(tests.SimplePagureTest): def test_lookup_deploykey_non_deploykey(self): """ Test lookup_deploykey with a non-deploykey username. """ - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') res = pagure.utils.lookup_deploykey(project, 'pingou') self.assertEquals(res, None) def test_lookup_deploykey_different_project(self): """ Test lookup_deploykey with a username for another project. """ - project = pagure.lib.query._get_project(self.session, 'test2') + project = retrieval_queries._get_project(self.session, 'test2') res = pagure.utils.lookup_deploykey(project, 'deploykey_test_1') self.assertEquals(res, None) def test_lookup_deploykey_non_existent_key(self): """ Test lookup_deploykey with a non-existing deploykey. """ - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') res = pagure.utils.lookup_deploykey(project, 'deploykey_test_2') self.assertEquals(res, None) def test_lookup_deploykey(self): """ Test lookup_deploykey with a correct username. """ - project = pagure.lib.query._get_project(self.session, 'test') + project = retrieval_queries._get_project(self.session, 'test') res = pagure.utils.lookup_deploykey(project, 'deploykey_test_1') self.assertNotEquals(res, None) self.assertFalse(res.pushaccess) diff --git a/tests/test_stream_server.py b/tests/test_stream_server.py index 0c84e4e..a41d5e1 100644 --- a/tests/test_stream_server.py +++ b/tests/test_stream_server.py @@ -32,7 +32,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( if six.PY3: raise unittest.case.SkipTest('Skipping on python3') -import pagure.lib.query # pylint: disable=wrong-import-position +from pagure.lib import retrieval_queries # pylint: disable=wrong-import-position from pagure.exceptions import PagureEvException # pylint: disable=wrong-import-position import tests # pylint: disable=wrong-import-position # comes from ev-server/ @@ -57,11 +57,11 @@ class StreamingServerTests(tests.Modeltests): # Setup projects tests.create_projects(self.session) - self.repo = pagure.lib.query._get_project(self.session, 'test') - self.repo2 = pagure.lib.query._get_project(self.session, 'test2') + self.repo = retrieval_queries._get_project(self.session, 'test') + self.repo2 = retrieval_queries._get_project(self.session, 'test2') # Disable repo 2's issue tracker and PR tracker - pagure.lib.query.update_project_settings( + retrieval_queries.update_project_settings( session=self.session, repo=self.repo2, user='pingou', @@ -72,7 +72,7 @@ class StreamingServerTests(tests.Modeltests): ) # Create a public issue - pagure.lib.query.new_issue( + retrieval_queries.new_issue( session=self.session, repo=self.repo, title='Test issue', @@ -81,7 +81,7 @@ class StreamingServerTests(tests.Modeltests): ) # Create a private issue - pagure.lib.query.new_issue( + retrieval_queries.new_issue( session=self.session, repo=self.repo, title='Private issue #2', @@ -91,7 +91,7 @@ class StreamingServerTests(tests.Modeltests): ) # Create a PR - pagure.lib.query.new_pull_request( + retrieval_queries.new_pull_request( session=self.session, repo_from=self.repo, repo_to=self.repo, @@ -146,7 +146,7 @@ class StreamingServerTests(tests.Modeltests): ) # No repo name. Note: we cannot catch 'namespace but no repo name', - # but that should fail later in pagure.lib.query.get_project + # but that should fail later in retrieval_queries.get_project six.assertRaisesRegex( self, PagureEvException, diff --git a/tests/test_tasks.py b/tests/test_tasks.py index 17e9071..bb0afeb 100644 --- a/tests/test_tasks.py +++ b/tests/test_tasks.py @@ -16,11 +16,11 @@ class MockCommit(object): self.commit_time = time -@patch('pagure.lib.query.create_session', new=Mock()) +@patch('retrieval_queries.create_session', new=Mock()) class TestCommitsAuthorStats(unittest.TestCase): def setUp(self): - self.search_user_patcher = patch('pagure.lib.query.search_user') + self.search_user_patcher = patch('retrieval_queries.search_user') mock_search_user = self.search_user_patcher.start() mock_search_user.side_effect = lambda _, email: self.authors.get(email)