| |
@@ -26,7 +26,7 @@
|
| |
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 @@
|
| |
"""
|
| |
|
| |
# 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 @@
|
| |
"""
|
| |
|
| |
# 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 @@
|
| |
"""
|
| |
|
| |
# 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 @@
|
| |
"""
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
"""
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
"""
|
| |
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 @@
|
| |
"""
|
| |
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 @@
|
| |
"""
|
| |
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 @@
|
| |
"""
|
| |
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 @@
|
| |
# 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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
"""
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
['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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
]
|
| |
)
|
| |
|
| |
- msg = pagure.lib.query.edit_issue(
|
| |
+ msg = retrieval_queries.edit_issue(
|
| |
session=self.session,
|
| |
issue=issue,
|
| |
user='pingou',
|
| |
@@ -596,14 +596,14 @@
|
| |
]
|
| |
)
|
| |
|
| |
- 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 @@
|
| |
]
|
| |
)
|
| |
|
| |
- 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 @@
|
| |
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 @@
|
| |
]
|
| |
)
|
| |
|
| |
- 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 @@
|
| |
@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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
@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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
@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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
'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 @@
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
|
| |
# 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 @@
|
| |
'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 @@
|
| |
|
| |
# 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 @@
|
| |
'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 @@
|
| |
|
| |
@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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
[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 @@
|
| |
[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 @@
|
| |
)
|
| |
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 @@
|
| |
['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 @@
|
| |
)
|
| |
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 @@
|
| |
['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 @@
|
| |
)
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
""" 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 @@
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
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 @@
|
| |
'?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 @@
|
| |
'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 @@
|
| |
|
| |
# Fork
|
| |
|
| |
- task = pagure.lib.query.fork_project(
|
| |
+ task = retrieval_queries.fork_project(
|
| |
session=self.session,
|
| |
user='foo',
|
| |
repo=project,
|
| |
@@ -2294,10 +2294,10 @@
|
| |
'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 @@
|
| |
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 @@
|
| |
'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 @@
|
| |
|
| |
# Fork worked
|
| |
|
| |
- task = pagure.lib.query.fork_project(
|
| |
+ task = retrieval_queries.fork_project(
|
| |
session=self.session,
|
| |
user='foo',
|
| |
repo=repo,
|
| |
@@ -2364,9 +2364,9 @@
|
| |
|
| |
# 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 @@
|
| |
|
| |
@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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
@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 @@
|
| |
|
| |
@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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
|
| |
@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 @@
|
| |
|
| |
# 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 @@
|
| |
)
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
@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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
@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 @@
|
| |
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 @@
|
| |
@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 @@
|
| |
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 @@
|
| |
|
| |
@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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
)
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
'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 @@
|
| |
|
| |
# 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 @@
|
| |
'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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
@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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
'''
|
| |
|
| |
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 @@
|
| |
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
'''
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
'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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
<p>foo bar</p>"""
|
| |
|
| |
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 @@
|
| |
<p>foo bar</p>"""
|
| |
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
['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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
[])
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
""" 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 @@
|
| |
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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
# 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 @@
|
| |
)
|
| |
|
| |
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 @@
|
| |
@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 @@
|
| |
# 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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
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 = '<a href="/path" title="click me!">Click here</a>'
|
| |
- 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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
)
|
| |
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
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 @@
|
| |
|
| |
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)
|
| |
|
| |
|
| |
The logcom_1 container was failing with this error message https://pastebin.com/y5hTV99w
I created new file
retrieval_queries.py
to move all the functions fromquery.py
which are called fromtasks.py
and fixed the calls and imports.In my environment the logcom_1 now works.