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

fix tests

Browse source
This commit is contained in:
Tomas Kopecek 2023-01-24 16:52:06 +01:00
parent cc5c074384
commit c1cc63e25b
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/test_lib/test_auth.py
View file

@ -140,7 +140,8 @@ class TestAuthSession(unittest.TestCase):
query = self.queries[0]
self.assertEqual(query.tables, ['sessions'])
self.assertEqual(query.joins, None)
self.assertEqual(query.clauses, ['hostip = %(hostip)s', 'id = %(id)i', 'key = %(key)s'])
self.assertEqual(query.clauses, ['closed IS FALSE', 'hostip = %(hostip)s', 'id = %(id)i',
'key = %(key)s'])
self.assertEqual(query.columns, ['authtype', 'callnum', 'exclusive', 'expired', 'master',
'start_time', "date_part('epoch', start_time)",
'update_time', "date_part('epoch', update_time)",
@ -160,7 +161,7 @@ class TestAuthSession(unittest.TestCase):
query = self.queries[2]
self.assertEqual(query.tables, ['sessions'])
self.assertEqual(query.joins, None)
self.assertEqual(query.clauses, ['exclusive = TRUE', 'expired = FALSE',
self.assertEqual(query.clauses, ['closed = FALSE', 'exclusive = TRUE',
'user_id=%(user_id)s'])
self.assertEqual(query.columns, ['id'])
@ -190,7 +191,8 @@ class TestAuthSession(unittest.TestCase):
query = self.queries[0]
self.assertEqual(query.tables, ['sessions'])
self.assertEqual(query.joins, None)
self.assertEqual(query.clauses, ['hostip = %(hostip)s', 'id = %(id)i', 'key = %(key)s'])
self.assertEqual(query.clauses, ['closed IS FALSE', 'hostip = %(hostip)s', 'id = %(id)i',
'key = %(key)s'])
self.assertEqual(query.columns, ['authtype', 'callnum', 'exclusive', 'expired', 'master',
'start_time', "date_part('epoch', start_time)",
'update_time', "date_part('epoch', update_time)",
@ -210,7 +212,7 @@ class TestAuthSession(unittest.TestCase):
query = self.queries[2]
self.assertEqual(query.tables, ['sessions'])
self.assertEqual(query.joins, None)
self.assertEqual(query.clauses, ['exclusive = TRUE', 'expired = FALSE',
self.assertEqual(query.clauses, ['closed = FALSE', 'exclusive = TRUE',
'user_id=%(user_id)s'])
self.assertEqual(query.columns, ['id'])
@ -460,7 +462,7 @@ class TestAuthSession(unittest.TestCase):
self.assertEqual(update.table, 'sessions')
self.assertEqual(update.values, {'session_id': 111, 'master': 123})
self.assertEqual(update.clauses, ['id = %(session_id)i', 'master = %(master)i'])
self.assertEqual(update.data, {'expired': True, 'exclusive': None})
self.assertEqual(update.data, {'expired': True, 'exclusive': None, 'closed': True})
self.assertEqual(update.rawdata, {})
def test_makeExclusive_not_master(self):
@ -513,7 +515,7 @@ class TestAuthSession(unittest.TestCase):
query = self.queries[4]
self.assertEqual(query.tables, ['sessions'])
self.assertEqual(query.joins, None)
self.assertEqual(query.clauses, ['exclusive = TRUE', 'expired = FALSE',
self.assertEqual(query.clauses, ['closed = FALSE', 'exclusive = TRUE',
'user_id=%(user_id)s'])
self.assertEqual(query.columns, ['id'])
self.assertEqual(query.values, {'user_id': 1})
@ -525,7 +527,7 @@ class TestAuthSession(unittest.TestCase):
self.assertEqual(update.table, 'sessions')
self.assertEqual(update.values, {'excl_id': 123})
self.assertEqual(update.clauses, ['id=%(excl_id)s'])
self.assertEqual(update.data, {'expired': True, 'exclusive': None})
self.assertEqual(update.data, {'expired': True, 'exclusive': None, 'closed': True})
self.assertEqual(update.rawdata, {})
update = self.updates[3]

6
tests/test_lib/test_gssapi.py
View file

@ -27,7 +27,7 @@ class TestGSSAPI(unittest.TestCase):
old_environ = dict(**os.environ)
self.session.gssapi_login()
self.session._callMethod.assert_called_with(
'sslLogin', [], {'proxyuser': None, 'session_key': None}, retry=False)
'sslLogin', [], {'proxyuser': None}, retry=False)
self.assertEqual(old_environ, dict(**os.environ))
@mock.patch('koji.reqgssapi.HTTPKerberosAuth')
@ -47,7 +47,7 @@ class TestGSSAPI(unittest.TestCase):
koji.reqgssapi.__version__ = accepted_version
rv = self.session.gssapi_login(principal, keytab, ccache)
self.session._callMethod.assert_called_with(
'sslLogin', [], {'proxyuser': None, 'session_key': None}, retry=False)
'sslLogin', [], {'proxyuser': None}, retry=False)
self.assertEqual(old_environ, dict(**os.environ))
self.assertTrue(rv)
self.session._callMethod.reset_mock()
@ -84,7 +84,7 @@ class TestGSSAPI(unittest.TestCase):
with self.assertRaises(koji.GSSAPIAuthError):
self.session.gssapi_login()
self.session._callMethod.assert_called_with(
'sslLogin', [], {'proxyuser': None, 'session_key': None}, retry=False)
'sslLogin', [], {'proxyuser': None}, retry=False)
self.assertEqual(old_environ, dict(**os.environ))
def test_gssapi_login_http(self):