PR#3489: Rewrite DB query to Procesors
Merges #3489 https://pagure.io/koji/pull-request/3489 Fixes: #3511 https://pagure.io/koji/issue/3511 Rewrite DB query to Procesors Fixes: #3493 https://pagure.io/koji/issue/3493 Query Select with 'FOR UPDATE'
This commit is contained in:
commit
125361326a
9 changed files with 614 additions and 416 deletions
700
hub/kojihub.py
700
hub/kojihub.py
File diff suppressed because it is too large
Load diff
|
|
@ -7,6 +7,7 @@ import kojihub
|
|||
|
||||
UP = kojihub.UpdateProcessor
|
||||
IP = kojihub.InsertProcessor
|
||||
QP = kojihub.QueryProcessor
|
||||
|
||||
|
||||
class TestAddHost(unittest.TestCase):
|
||||
|
|
@ -22,6 +23,14 @@ 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()
|
||||
query.singleValue = self.query_singleValue
|
||||
self.queries.append(query)
|
||||
return query
|
||||
|
||||
def setUp(self):
|
||||
self.InsertProcessor = mock.patch('kojihub.InsertProcessor',
|
||||
side_effect=self.getInsert).start()
|
||||
|
|
@ -29,6 +38,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,11 +51,10 @@ 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()
|
||||
self.get_user = mock.patch('kojihub.get_user').start()
|
||||
self.query_singleValue = mock.MagicMock()
|
||||
|
||||
def tearDown(self):
|
||||
mock.patch.stopall()
|
||||
|
|
@ -53,17 +64,17 @@ 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
|
||||
self.get_host.return_value = {}
|
||||
self._singleValue.return_value = 333
|
||||
self.nextval.return_value = 12
|
||||
self.context.session.createUser.return_value = 456
|
||||
self.get_user.return_value = None
|
||||
self.query_singleValue.return_value = 333
|
||||
|
||||
r = self.exports.addHost('hostname', ['i386', 'x86_64'])
|
||||
self.assertEqual(r, 12)
|
||||
|
|
@ -72,12 +83,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 +101,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 +126,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
|
||||
|
|
@ -127,16 +151,23 @@ class TestAddHost(unittest.TestCase):
|
|||
'usertype': koji.USERTYPES['GROUP']
|
||||
}
|
||||
self.get_host.return_value = {}
|
||||
self.query_singleValue.return_value = 333
|
||||
|
||||
with self.assertRaises(koji.GenericError):
|
||||
with self.assertRaises(koji.GenericError) as ex:
|
||||
self.exports.addHost('hostname', ['i386', 'x86_64'], force=True)
|
||||
self.assertEqual("user hostname already exists and it is not a host", str(ex.exception))
|
||||
|
||||
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 +185,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 +193,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'"]))
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import koji
|
|||
import kojihub
|
||||
|
||||
IP = kojihub.InsertProcessor
|
||||
QP = kojihub.QueryProcessor
|
||||
|
||||
|
||||
class TestAddRPMSig(unittest.TestCase):
|
||||
|
|
@ -16,10 +17,20 @@ class TestAddRPMSig(unittest.TestCase):
|
|||
self.inserts.append(insert)
|
||||
return insert
|
||||
|
||||
def getQuery(self, *args, **kwargs):
|
||||
query = QP(*args, **kwargs)
|
||||
query.execute = self.query_execute
|
||||
self.queries.append(query)
|
||||
return query
|
||||
|
||||
def setUp(self):
|
||||
self.InsertProcessor = mock.patch('kojihub.InsertProcessor',
|
||||
side_effect=self.getInsert).start()
|
||||
self.inserts = []
|
||||
self.QueryProcessor = mock.patch('kojihub.QueryProcessor',
|
||||
side_effect=self.getQuery).start()
|
||||
self.queries = []
|
||||
self.query_execute = mock.MagicMock()
|
||||
self.context = mock.patch('kojihub.context').start()
|
||||
# It seems MagicMock will not automatically handle attributes that
|
||||
# start with "assert"
|
||||
|
|
@ -32,7 +43,6 @@ class TestAddRPMSig(unittest.TestCase):
|
|||
def tearDown(self):
|
||||
mock.patch.stopall()
|
||||
|
||||
@mock.patch('kojihub._fetchMulti')
|
||||
@mock.patch('koji.plugin.run_callbacks')
|
||||
@mock.patch('kojihub.get_rpm')
|
||||
@mock.patch('kojihub.get_build')
|
||||
|
|
@ -46,10 +56,9 @@ class TestAddRPMSig(unittest.TestCase):
|
|||
isdir,
|
||||
get_build,
|
||||
get_rpm,
|
||||
run_callbacks,
|
||||
_fetchMulti):
|
||||
run_callbacks):
|
||||
"""Test addRPMSig with header-only signed RPM"""
|
||||
_fetchMulti.side_effect = [[]]
|
||||
self.query_execute.side_effect = [[]]
|
||||
isdir.side_effect = [True]
|
||||
get_rpm.side_effect = [{
|
||||
'id': 1,
|
||||
|
|
|
|||
|
|
@ -5,14 +5,23 @@ import mock
|
|||
import koji
|
||||
import kojihub
|
||||
|
||||
QP = kojihub.QueryProcessor
|
||||
|
||||
|
||||
class TestEditBuildTarget(unittest.TestCase):
|
||||
|
||||
def getQuery(self, *args, **kwargs):
|
||||
query = QP(*args, **kwargs)
|
||||
query.execute = mock.MagicMock()
|
||||
query.executeOne = mock.MagicMock()
|
||||
query.singleValue = self.query_singleValue
|
||||
self.queries.append(query)
|
||||
return query
|
||||
|
||||
def setUp(self):
|
||||
self.lookup_build_target = mock.patch('kojihub.lookup_build_target').start()
|
||||
self.verify_name_internal = mock.patch('kojihub.verify_name_internal').start()
|
||||
self.get_tag = mock.patch('kojihub.get_tag').start()
|
||||
self._singleValue = mock.patch('kojihub._singleValue').start()
|
||||
self.exports = kojihub.RootExports()
|
||||
self.target_name = 'build-target'
|
||||
self.name = 'build-target-rename'
|
||||
|
|
@ -23,6 +32,10 @@ class TestEditBuildTarget(unittest.TestCase):
|
|||
self.dest_tag_info = {'id': 112, 'name': self.dest_tag}
|
||||
self.session = kojihub.context.session = mock.MagicMock()
|
||||
self.session.assertPerm = mock.MagicMock()
|
||||
self.QueryProcessor = mock.patch('kojihub.QueryProcessor',
|
||||
side_effect=self.getQuery).start()
|
||||
self.queries = []
|
||||
self.query_singleValue = mock.MagicMock()
|
||||
|
||||
def tearDown(self):
|
||||
mock.patch.stopall()
|
||||
|
|
@ -81,7 +94,7 @@ class TestEditBuildTarget(unittest.TestCase):
|
|||
self.verify_name_internal.return_value = None
|
||||
self.lookup_build_target.return_value = self.target_info
|
||||
self.get_tag.side_effect = [self.build_tag_info, self.dest_tag_info]
|
||||
self._singleValue.return_value = 2
|
||||
self.query_singleValue.return_value = 2
|
||||
with self.assertRaises(koji.GenericError) as cm:
|
||||
self.exports.editBuildTarget(self.target_name, self.name, self.build_tag,
|
||||
self.dest_tag)
|
||||
|
|
@ -91,4 +104,3 @@ class TestEditBuildTarget(unittest.TestCase):
|
|||
self.verify_name_internal.called_once_with(name=self.name)
|
||||
self.lookup_build_target.called_once_with(self.target_name)
|
||||
self.get_tag.has_calls([mock.call(self.build_tag), mock.call(self.dest_tag)])
|
||||
self._singleValue.called_once_with(self.name)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import kojihub
|
|||
|
||||
UP = kojihub.UpdateProcessor
|
||||
IP = kojihub.InsertProcessor
|
||||
QP = kojihub.QueryProcessor
|
||||
|
||||
|
||||
class TestEditTag(unittest.TestCase):
|
||||
|
|
@ -23,6 +24,14 @@ class TestEditTag(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()
|
||||
query.singleValue = self.query_singleValue
|
||||
self.queries.append(query)
|
||||
return query
|
||||
|
||||
def setUp(self):
|
||||
self.InsertProcessor = mock.patch('kojihub.InsertProcessor',
|
||||
side_effect=self.getInsert).start()
|
||||
|
|
@ -30,8 +39,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()
|
||||
self.verify_name_internal = mock.patch('kojihub.verify_name_internal').start()
|
||||
|
|
@ -40,6 +47,10 @@ class TestEditTag(unittest.TestCase):
|
|||
# It seems MagicMock will not automatically handle attributes that
|
||||
# start with "assert"
|
||||
self.context_db.session.assertLogin = mock.MagicMock()
|
||||
self.QueryProcessor = mock.patch('kojihub.QueryProcessor',
|
||||
side_effect=self.getQuery).start()
|
||||
self.queries = []
|
||||
self.query_singleValue = mock.MagicMock()
|
||||
|
||||
def tearDown(self):
|
||||
mock.patch.stopall()
|
||||
|
|
@ -65,7 +76,7 @@ class TestEditTag(unittest.TestCase):
|
|||
'extra': {'exA': 1,
|
||||
'exC': 3,
|
||||
'exD': 4}}
|
||||
self._singleValue.return_value = None
|
||||
self.query_singleValue.return_value = None
|
||||
self.verify_name_internal.return_value = None
|
||||
self.context_db.event_id = 42
|
||||
self.context_db.session.user_id = 23
|
||||
|
|
@ -83,13 +94,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 +120,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 +155,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 +180,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)
|
||||
|
|
@ -188,8 +210,7 @@ WHERE id = %(tagID)i""", {'name': 'newtag', 'tagID': 333})
|
|||
# no4 invoke
|
||||
self.get_perm_id.reset_mock()
|
||||
self.get_perm_id.return_value = 99
|
||||
self._singleValue.reset_mock()
|
||||
self._singleValue.return_value = 2
|
||||
self.query_singleValue.return_value = 2
|
||||
|
||||
kwargs = {
|
||||
'perm': 'admin',
|
||||
|
|
@ -198,7 +219,6 @@ WHERE id = %(tagID)i""", {'name': 'newtag', 'tagID': 333})
|
|||
with self.assertRaises(koji.GenericError) as cm:
|
||||
kojihub._edit_tag('tag', **kwargs)
|
||||
self.get_perm_id.assert_called_once()
|
||||
self._singleValue.assert_called_once()
|
||||
self.assertEqual(cm.exception.args[0], 'Name newtag already taken by tag 2')
|
||||
|
||||
def test_invalid_archs(self):
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import koji
|
|||
import kojihub
|
||||
|
||||
UP = kojihub.UpdateProcessor
|
||||
QP = kojihub.QueryProcessor
|
||||
|
||||
|
||||
class TestEditUser(unittest.TestCase):
|
||||
|
|
@ -16,9 +17,16 @@ class TestEditUser(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()
|
||||
query.singleValue = self.query_singleValue
|
||||
self.queries.append(query)
|
||||
return query
|
||||
|
||||
def setUp(self):
|
||||
self.updates = []
|
||||
self._singleValue = mock.patch('kojihub._singleValue').start()
|
||||
self.get_user = mock.patch('kojihub.get_user').start()
|
||||
self.verify_name_user = mock.patch('kojihub.verify_name_user').start()
|
||||
self.context = mock.patch('kojihub.context').start()
|
||||
|
|
@ -27,6 +35,10 @@ class TestEditUser(unittest.TestCase):
|
|||
# It seems MagicMock will not automatically handle attributes that
|
||||
# start with "assert"
|
||||
self.context.session.assertLogin = mock.MagicMock()
|
||||
self.QueryProcessor = mock.patch('kojihub.QueryProcessor',
|
||||
side_effect=self.getQuery).start()
|
||||
self.queries = []
|
||||
self.query_singleValue = mock.MagicMock()
|
||||
|
||||
def tearDown(self):
|
||||
mock.patch.stopall()
|
||||
|
|
@ -35,7 +47,7 @@ class TestEditUser(unittest.TestCase):
|
|||
self.get_user.return_value = {'id': 333,
|
||||
'name': 'user',
|
||||
'krb_principals': ['krb']}
|
||||
self._singleValue.return_value = None
|
||||
self.query_singleValue.return_value = None
|
||||
self.verify_name_user.return_value = None
|
||||
|
||||
kojihub._edit_user('user', name='newuser')
|
||||
|
|
@ -44,7 +56,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'}])
|
||||
|
|
@ -88,11 +100,10 @@ class TestEditUser(unittest.TestCase):
|
|||
self.context.session.removeKrbPrincipal.assert_not_called()
|
||||
self.context.session.setKrbPrincipal.assert_not_called()
|
||||
|
||||
self._singleValue.reset_mock()
|
||||
self._singleValue.return_value = 2
|
||||
self.query_singleValue.reset_mock()
|
||||
self.query_singleValue.return_value = 2
|
||||
with self.assertRaises(koji.GenericError) as cm:
|
||||
kojihub._edit_user('user', name='newuser')
|
||||
self._singleValue.assert_called_once()
|
||||
self.assertEqual(cm.exception.args[0],
|
||||
'Name newuser already taken by user 2')
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,24 @@ import mock
|
|||
import koji
|
||||
import kojihub
|
||||
|
||||
QP = kojihub.QueryProcessor
|
||||
|
||||
|
||||
class TestFindBuildId(unittest.TestCase):
|
||||
|
||||
def getQuery(self, *args, **kwargs):
|
||||
query = QP(*args, **kwargs)
|
||||
query.execute = mock.MagicMock()
|
||||
query.executeOne = mock.MagicMock()
|
||||
query.singleValue = self.query_singleValue
|
||||
self.queries.append(query)
|
||||
return query
|
||||
|
||||
def setUp(self):
|
||||
self.context = mock.patch('kojihub.context').start()
|
||||
self.cursor = mock.MagicMock()
|
||||
self.QueryProcessor = mock.patch('kojihub.QueryProcessor',
|
||||
side_effect=self.getQuery).start()
|
||||
self.queries = []
|
||||
self.query_singleValue = mock.MagicMock()
|
||||
|
||||
def test_non_exist_build_dict(self):
|
||||
build = {
|
||||
|
|
@ -18,16 +30,13 @@ class TestFindBuildId(unittest.TestCase):
|
|||
'version': 'test_version',
|
||||
'release': 'test_release',
|
||||
}
|
||||
self.cursor.fetchone.return_value = None
|
||||
self.context.cnx.cursor.return_value = self.cursor
|
||||
self.query_singleValue.return_value = None
|
||||
with self.assertRaises(koji.GenericError) as cm:
|
||||
kojihub.find_build_id(build, strict=True)
|
||||
self.assertEqual("No such build: %s" % build, str(cm.exception))
|
||||
|
||||
def test_invalid_argument(self):
|
||||
build = ['test-build']
|
||||
self.cursor.fetchone.return_value = None
|
||||
self.context.cnx.cursor.return_value = self.cursor
|
||||
with self.assertRaises(koji.GenericError) as cm:
|
||||
kojihub.find_build_id(build)
|
||||
self.assertEqual("Invalid type for argument: %s" % type(build), str(cm.exception))
|
||||
|
|
@ -40,8 +49,6 @@ class TestFindBuildId(unittest.TestCase):
|
|||
'owner': 'test_owner',
|
||||
'extra': {'extra_key': 'extra_value'},
|
||||
}
|
||||
self.cursor.fetchone.return_value = None
|
||||
self.context.cnx.cursor.return_value = self.cursor
|
||||
with self.assertRaises(koji.GenericError) as cm:
|
||||
kojihub.find_build_id(build, strict=True)
|
||||
self.assertEqual("did not provide name, version, and release", str(cm.exception))
|
||||
|
|
|
|||
|
|
@ -5,9 +5,33 @@ import unittest
|
|||
import koji
|
||||
import kojihub
|
||||
|
||||
UP = kojihub.UpdateProcessor
|
||||
QP = kojihub.QueryProcessor
|
||||
|
||||
|
||||
class TestHost(unittest.TestCase):
|
||||
|
||||
def getUpdate(self, *args, **kwargs):
|
||||
update = UP(*args, **kwargs)
|
||||
update.execute = mock.MagicMock()
|
||||
self.updates.append(update)
|
||||
return update
|
||||
|
||||
def getQuery(self, *args, **kwargs):
|
||||
query = QP(*args, **kwargs)
|
||||
query.execute = self.query_execute
|
||||
self.queries.append(query)
|
||||
return query
|
||||
|
||||
def setUp(self):
|
||||
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.query_execute = mock.MagicMock()
|
||||
|
||||
@mock.patch('kojihub.context')
|
||||
def test_instantiation_not_a_host(self, context):
|
||||
context.session.getHostId.return_value = None
|
||||
|
|
@ -105,32 +129,41 @@ class TestHost(unittest.TestCase):
|
|||
)
|
||||
self.assertEqual(processor.call_args_list[2], update3)
|
||||
|
||||
@mock.patch('kojihub.context')
|
||||
def test_task_wait_check(self, context):
|
||||
cursor = mock.MagicMock()
|
||||
context.cnx.cursor.return_value = cursor
|
||||
cursor.fetchall.return_value = [
|
||||
(1, 1),
|
||||
(2, 2),
|
||||
(3, 3),
|
||||
(4, 4),
|
||||
]
|
||||
def test_task_wait_check(self):
|
||||
self.query_execute.return_value = [{'id': 1, 'state': 1},
|
||||
{'id': 2, 'state': 2},
|
||||
{'id': 3, 'state': 3},
|
||||
{'id': 4, 'state': 4}, ]
|
||||
host = kojihub.Host(id=1234)
|
||||
finished, unfinished = host.taskWaitCheck(parent=123)
|
||||
cursor.execute.assert_called_once()
|
||||
self.assertEqual(finished, [2, 3])
|
||||
self.assertEqual(unfinished, [1, 4])
|
||||
|
||||
@mock.patch('kojihub.context')
|
||||
def test_task_wait(self, context):
|
||||
cursor = mock.MagicMock()
|
||||
context.cnx.cursor.return_value = cursor
|
||||
cursor.fetchall.return_value = [
|
||||
(1, 1),
|
||||
(2, 2),
|
||||
(3, 3),
|
||||
(4, 4),
|
||||
]
|
||||
self.query_execute.return_value = [{'id': 1, 'state': 1},
|
||||
{'id': 2, 'state': 2},
|
||||
{'id': 3, 'state': 3},
|
||||
{'id': 4, 'state': 4}, ]
|
||||
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)
|
||||
|
||||
data = {'awaited': False}
|
||||
|
||||
update = self.updates[0]
|
||||
values = {'id': 2}
|
||||
self.assertEqual(update.table, 'task')
|
||||
self.assertEqual(update.values, values)
|
||||
self.assertEqual(update.data, data)
|
||||
self.assertEqual(update.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, data)
|
||||
self.assertEqual(update.rawdata, {})
|
||||
self.assertEqual(update.clauses, ['id=%(id)s'])
|
||||
|
|
|
|||
48
tests/test_hub/test_set_build_owner.py
Normal file
48
tests/test_hub/test_set_build_owner.py
Normal 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)
|
||||
Loading…
Add table
Add a link
Reference in a new issue