particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrite DB query to Procesors

Browse source 
Fixes: https://pagure.io/koji/issue/3511
Fixes: https://pagure.io/koji/issue/3493
This commit is contained in:
Jana Cupova 2022-09-05 11:31:19 +02:00 • committed by Tomas Kopecek
parent 2f3e35257f
commit b9166945f5
6 changed files with 504 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

705
hub/kojihub.py
View file

File diff suppressed because it is too large Load diff

73
tests/test_hub/test_add_host.py
View file

@ -7,6 +7,7 @@ import kojihub
UP = kojihub.UpdateProcessor
IP = kojihub.InsertProcessor
QP = kojihub.QueryProcessor
class TestAddHost(unittest.TestCase):
@ -22,6 +23,13 @@ class TestAddHost(unittest.TestCase):
self.updates.append(update)
return update
def getQuery(self, *args, **kwargs):
query = QP(*args, **kwargs)
query.execute = mock.MagicMock()
query.executeOne = mock.MagicMock()
self.queries.append(query)
return query
def setUp(self):
self.InsertProcessor = mock.patch('kojihub.InsertProcessor',
side_effect=self.getInsert).start()
@ -29,6 +37,9 @@ class TestAddHost(unittest.TestCase):
self.UpdateProcessor = mock.patch('kojihub.UpdateProcessor',
side_effect=self.getUpdate).start()
self.updates = []
self.QueryProcessor = mock.patch('kojihub.QueryProcessor',
side_effect=self.getQuery).start()
self.queries = []
self.context = mock.patch('kojihub.context').start()
self.context_db = mock.patch('koji.db.context').start()
# It seems MagicMock will not automatically handle attributes that
@ -39,7 +50,6 @@ class TestAddHost(unittest.TestCase):
self.exports = kojihub.RootExports()
self.verify_host_name = mock.patch('kojihub.verify_host_name').start()
self.verify_name_user = mock.patch('kojihub.verify_name_user').start()
self._dml = mock.patch('kojihub._dml').start()
self.get_host = mock.patch('kojihub.get_host').start()
self._singleValue = mock.patch('kojihub._singleValue').start()
self.nextval = mock.patch('kojihub.nextval').start()
@ -53,9 +63,9 @@ class TestAddHost(unittest.TestCase):
self.get_host.return_value = {'id': 123}
with self.assertRaises(koji.GenericError):
self.exports.addHost('hostname', ['i386', 'x86_64'])
self._dml.assert_not_called()
self.get_host.assert_called_once_with('hostname')
self._singleValue.assert_not_called()
self.nextval.assert_not_called()
self.assertEqual(len(self.queries), 0)
def test_add_host_valid(self):
self.verify_host_name.return_value = None
@ -72,12 +82,13 @@ class TestAddHost(unittest.TestCase):
kojihub.get_host.assert_called_once_with('hostname')
self.context.session.createUser.assert_called_once_with(
'hostname', usertype=koji.USERTYPES['HOST'], krb_principal='-hostname-')
self._singleValue.assert_called_once_with("SELECT id FROM channels WHERE name = 'default'")
self.nextval.assert_called_once_with('host_id_seq')
self.assertEqual(self._dml.call_count, 1)
self._dml.assert_called_once_with("INSERT INTO host (id, user_id, name) "
"VALUES (%(hostID)i, %(userID)i, %(hostname)s)",
{'hostID': 12, 'userID': 456, 'hostname': 'hostname'})
self.assertEqual(len(self.queries), 1)
query = self.queries[0]
self.assertEqual(query.tables, ['channels'])
self.assertEqual(query.joins, None)
self.assertEqual(set(query.columns), set(['id']))
self.assertEqual(set(query.clauses), set(["name = 'default'"]))
def test_add_host_wrong_user(self):
self.verify_host_name.return_value = None
@ -89,17 +100,24 @@ class TestAddHost(unittest.TestCase):
self.get_host.return_value = {}
with self.assertRaises(koji.GenericError):
self.exports.addHost('hostname', ['i386', 'x86_64'])
self._dml.assert_not_called()
self.get_user.assert_called_once_with(userInfo={'name': 'hostname'})
self.get_host.assert_called_once_with('hostname')
self._singleValue.assert_called_once()
self.nextval.assert_not_called()
self.assertEqual(len(self.inserts), 0)
self.assertEqual(len(self.updates), 0)
self.assertEqual(len(self.queries), 1)
query = self.queries[0]
self.assertEqual(query.tables, ['channels'])
self.assertEqual(query.joins, None)
self.assertEqual(set(query.columns), set(['id']))
self.assertEqual(set(query.clauses), set(["name = 'default'"]))
def test_add_host_wrong_user_forced(self):
self.verify_host_name.return_value = None
user_id = 123
self.nextval.return_value = user_id
self.get_user.return_value = {
'id': 123,
'id': user_id,
'name': 'hostname',
'usertype': koji.USERTYPES['NORMAL']
}
@ -107,17 +125,22 @@ class TestAddHost(unittest.TestCase):
self.exports.addHost('hostname', ['i386', 'x86_64'], force=True)
self._dml.assert_called_once()
self.get_user.assert_called_once_with(userInfo={'name': 'hostname'})
self.get_host.assert_called_once_with('hostname')
self._singleValue.assert_called()
self.assertEqual(len(self.inserts), 2)
self.nextval.assert_called_once_with('host_id_seq')
self.assertEqual(len(self.inserts), 3)
self.assertEqual(len(self.updates), 1)
update = self.updates[0]
self.assertEqual(update.values, {'userID': 123})
self.assertEqual(update.values, {'userID': user_id})
self.assertEqual(update.table, 'users')
self.assertEqual(update.clauses, ['id = %(userID)i'])
self.assertEqual(update.data, {'usertype': koji.USERTYPES['HOST']})
self.assertEqual(len(self.queries), 1)
query = self.queries[0]
self.assertEqual(query.tables, ['channels'])
self.assertEqual(query.joins, None)
self.assertEqual(set(query.columns), set(['id']))
self.assertEqual(set(query.clauses), set(["name = 'default'"]))
def test_add_host_superwrong_user_forced(self):
self.verify_host_name.return_value = None
@ -131,12 +154,17 @@ class TestAddHost(unittest.TestCase):
with self.assertRaises(koji.GenericError):
self.exports.addHost('hostname', ['i386', 'x86_64'], force=True)
self._dml.assert_not_called()
self.get_user.assert_called_once_with(userInfo={'name': 'hostname'})
self.get_host.assert_called_once_with('hostname')
self._singleValue.assert_called()
self.nextval.assert_not_called()
self.assertEqual(len(self.inserts), 0)
self.assertEqual(len(self.updates), 0)
self.assertEqual(len(self.queries), 1)
query = self.queries[0]
self.assertEqual(query.tables, ['channels'])
self.assertEqual(query.joins, None)
self.assertEqual(set(query.columns), set(['id']))
self.assertEqual(set(query.clauses), set(["name = 'default'"]))
def test_add_host_wrong_format(self):
# name is longer as expected
@ -154,7 +182,7 @@ class TestAddHost(unittest.TestCase):
krb_principal = ['test-krb']
self.verify_host_name.return_value = None
self.get_host.return_value = {}
self._singleValue.side_effect = [333, 12]
self.QueryProcessor.return_value = 333
self.verify_name_user.side_effect = koji.GenericError
with self.assertRaises(koji.GenericError):
self.exports.addHost('hostname', ['i386', 'x86_64'], krb_principal=krb_principal)
@ -162,6 +190,11 @@ class TestAddHost(unittest.TestCase):
self.context.session.assertPerm.assert_called_once_with('host')
kojihub.get_host.assert_called_once_with('hostname')
self.context.session.createUser.assert_not_called()
self.assertEqual(self._singleValue.call_count, 1)
self._singleValue.assert_called_once_with("SELECT id FROM channels WHERE name = 'default'")
self.verify_host_name.assert_called_once_with('hostname')
self.nextval.assert_not_called()
self.assertEqual(len(self.queries), 1)
query = self.queries[0]
self.assertEqual(query.tables, ['channels'])
self.assertEqual(query.joins, None)
self.assertEqual(set(query.columns), set(['id']))
self.assertEqual(set(query.clauses), set(["name = 'default'"]))

26
tests/test_hub/test_edit_tag.py
View file

@ -30,7 +30,6 @@ class TestEditTag(unittest.TestCase):
self.UpdateProcessor = mock.patch('kojihub.UpdateProcessor',
side_effect=self.getUpdate).start()
self.updates = []
self._dml = mock.patch('kojihub._dml').start()
self._singleValue = mock.patch('kojihub._singleValue').start()
self.get_tag = mock.patch('kojihub.get_tag').start()
self.get_perm_id = mock.patch('kojihub.get_perm_id').start()
@ -83,13 +82,22 @@ class TestEditTag(unittest.TestCase):
kojihub._edit_tag('tag', **kwargs)
self.get_perm_id.assert_not_called()
self._dml.assert_called_with("""UPDATE tag
SET name = %(name)s
WHERE id = %(tagID)i""", {'name': 'newtag', 'tagID': 333})
# check the insert/update
self.assertEqual(len(self.updates), 3)
self.assertEqual(len(self.updates), 4)
self.assertEqual(len(self.inserts), 2)
revoke_data = {'name': 'newtag'}
values = {'tagID': 333}
update = self.updates[0]
self.assertEqual(update.table, 'tag')
self.assertEqual(update.values, values)
self.assertEqual(update.data, revoke_data)
self.assertEqual(update.rawdata, {})
self.assertEqual(update.clauses, ['id = %(tagID)i'])
values = {
'arches': 'arch1 arch2',
'locked': True,
@ -100,12 +108,14 @@ WHERE id = %(tagID)i""", {'name': 'newtag', 'tagID': 333})
'name': 'tag',
'extra': {'exA': 1, 'exC': 3, 'exD': 4}
}
revoke_data = {
'revoke_event': 42,
'revoker_id': 23
}
revoke_rawdata = {'active': 'NULL'}
update = self.updates[0]
update = self.updates[1]
self.assertEqual(update.table, 'tag_config')
self.assertEqual(update.values, values)
self.assertEqual(update.data, revoke_data)
@ -133,7 +143,7 @@ WHERE id = %(tagID)i""", {'name': 'newtag', 'tagID': 333})
'tag_id': 333,
}
update = self.updates[1]
update = self.updates[2]
self.assertEqual(update.table, 'tag_extra')
self.assertEqual(update.values, values)
self.assertEqual(update.data, revoke_data)
@ -158,7 +168,7 @@ WHERE id = %(tagID)i""", {'name': 'newtag', 'tagID': 333})
'tag_id': 333,
}
update = self.updates[2]
update = self.updates[3]
self.assertEqual(update.table, 'tag_extra')
self.assertEqual(update.values, values)
self.assertEqual(update.data, revoke_data)

2
tests/test_hub/test_edit_user.py
View file

@ -44,7 +44,7 @@ class TestEditUser(unittest.TestCase):
update = self.updates[0]
self.assertEqual(update.table, 'users')
self.assertEqual(update.data, {'name': 'newuser'})
self.assertEqual(update.values, {'userID': 333})
self.assertEqual(update.values, {'name': 'newuser', 'userID': 333})
self.assertEqual(update.clauses, ['id = %(userID)i'])
kojihub._edit_user('user', krb_principal_mappings=[{'old': 'krb', 'new': 'newkrb'}])

38
tests/test_hub/test_models/test_host.py
View file

@ -5,9 +5,22 @@ import unittest
import koji
import kojihub
UP = kojihub.UpdateProcessor
class TestHost(unittest.TestCase):
def getUpdate(self, *args, **kwargs):
update = UP(*args, **kwargs)
update.execute = mock.MagicMock()
self.updates.append(update)
return update
def setUp(self):
self.UpdateProcessor = mock.patch('kojihub.UpdateProcessor',
side_effect=self.getUpdate).start()
self.updates = []
@mock.patch('kojihub.context')
def test_instantiation_not_a_host(self, context):
context.session.getHostId.return_value = None
@ -125,12 +138,35 @@ class TestHost(unittest.TestCase):
def test_task_wait(self, context):
cursor = mock.MagicMock()
context.cnx.cursor.return_value = cursor
context.session.assertLogin = mock.MagicMock()
cursor.fetchall.return_value = [
(1, 1),
(2, 2),
(3, 3),
(4, 4),
]
context.event_id = 42
context.session.user_id = 23
kojihub.Host.return_value = 1234
host = kojihub.Host(id=1234)
host.taskWait(parent=123)
self.assertEqual(len(cursor.execute.mock_calls), 3)
self.assertEqual(len(self.updates), 2)
self.assertEqual(len(cursor.execute.mock_calls), 1)
rawdata = {'awaited': 'false'}
update = self.updates[0]
values = {'id': 2}
self.assertEqual(update.table, 'task')
self.assertEqual(update.values, values)
self.assertEqual(update.data, {})
self.assertEqual(update.rawdata, rawdata)
self.assertEqual(update.clauses, ['id=%(id)s'])
update = self.updates[1]
values = {'id': 3}
self.assertEqual(update.table, 'task')
self.assertEqual(update.values, values)
self.assertEqual(update.data, {})
self.assertEqual(update.rawdata, rawdata)
self.assertEqual(update.clauses, ['id=%(id)s'])

48
tests/test_hub/test_set_build_owner.py Normal file
View file

@ -0,0 +1,48 @@
import mock
import unittest
import kojihub
UP = kojihub.UpdateProcessor
class TestSetBuildOwner(unittest.TestCase):
def getUpdate(self, *args, **kwargs):
update = UP(*args, **kwargs)
update.execute = mock.MagicMock()
self.updates.append(update)
return update
def setUp(self):
self.UpdateProcessor = mock.patch('kojihub.UpdateProcessor',
side_effect=self.getUpdate).start()
self.updates = []
self.context = mock.patch('kojihub.context').start()
# It seems MagicMock will not automatically handle attributes that
# start with "assert"
self.context.session.assertLogin = mock.MagicMock()
self.context.session.assertPerm = mock.MagicMock()
self.exports = kojihub.RootExports()
self.get_build = mock.patch('kojihub.get_build').start()
self.get_user = mock.patch('kojihub.get_user').start()
self.run_callbacks = mock.patch('koji.plugin.run_callbacks').start()
def tearDown(self):
mock.patch.stopall()
def test_set_build_owner(self):
self.get_build.return_value = {'id': 123, 'owner_id': 1}
self.get_user.return_value = {'id': 2}
self.context.event_id = 42
self.context.session.user_id = 23
self.exports.setBuildOwner('test-build', 'test-user')
clauses = ['id=%(buildid)i']
data = {'owner': 2}
values = {'buildid': 123}
update = self.updates[0]
self.assertEqual(update.table, 'build')
self.assertEqual(update.data, data)
self.assertEqual(update.rawdata, {})
self.assertEqual(update.clauses, clauses)
self.assertEqual(update.values, values)