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

PR#3794: Unify getSessionInfo output

Browse source 
Merges #3794
https://pagure.io/koji/pull-request/3794

Fixes: #3793
https://pagure.io/koji/issue/3793
getSessionInfo returns fewer items when user_id is used than default

Trivial rebase conflict in unit test
This commit is contained in:
Mike McLean 2023-09-13 18:35:45 -04:00
commit a40ce2119c
2 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kojihub/kojihub.py
View file

@ -10433,8 +10433,10 @@ class RootExports(object):
('master', 'master'),
('authtype', 'authtype'),
('callnum', 'callnum'),
("date_part('epoch', start_time)", 'start_time'),
('start_time', 'start_time'),
("date_part('epoch', start_time)", 'start_ts'),
('update_time', 'update_time'),
("date_part('epoch', update_time)", 'update_ts'),
('exclusive', 'exclusive'),
]
columns, aliases = zip(*fields)

33
tests/test_hub/test_get_session_info.py
View file

@ -41,10 +41,12 @@ class TestGetSessionInfo(DBQueryTestCase):
self.assertEqual(query.clauses, ['expired is FALSE', 'user_id = %(user_id)i'])
self.assertEqual(query.joins, None)
self.assertEqual(query.columns, ['authtype', 'callnum', 'exclusive', 'expired', 'master',
"date_part('epoch', start_time)",
'update_time', 'user_id'])
'start_time', "date_part('epoch', start_time)",
'update_time', "date_part('epoch', update_time)",
'user_id'])
self.assertEqual(query.aliases, ['authtype', 'callnum', 'exclusive', 'expired', 'master',
'start_time', 'update_time', 'user_id'])
'start_time', 'start_ts', 'update_time', 'update_ts',
'user_id'])
def test_get_session_info_user_and_details(self):
self.context.session.logged_in = True
@ -56,10 +58,13 @@ class TestGetSessionInfo(DBQueryTestCase):
self.assertEqual(query.clauses, ['expired is FALSE', 'user_id = %(user_id)i'])
self.assertEqual(query.joins, None)
self.assertEqual(query.columns, ['authtype', 'callnum', 'exclusive', 'expired', 'hostip',
'id', 'master', "date_part('epoch', start_time)",
'update_time', 'user_id'])
'id', 'master', 'start_time',
"date_part('epoch', start_time)",
'update_time', "date_part('epoch', update_time)",
'user_id'])
self.assertEqual(query.aliases, ['authtype', 'callnum', 'exclusive', 'expired', 'hostip',
'id', 'master', 'start_time', 'update_time', 'user_id'])
'id', 'master', 'start_time', 'start_ts', 'update_time',
'update_ts', 'user_id'])
def test_get_session_info_user(self):
self.context.session.logged_in = True
@ -71,10 +76,12 @@ class TestGetSessionInfo(DBQueryTestCase):
self.assertEqual(query.clauses, ['expired is FALSE', 'user_id = %(user_id)i'])
self.assertEqual(query.joins, None)
self.assertEqual(query.columns, ['authtype', 'callnum', 'exclusive', 'expired', 'master',
"date_part('epoch', start_time)",
'update_time', 'user_id'])
'start_time', "date_part('epoch', start_time)",
'update_time', "date_part('epoch', update_time)",
'user_id'])
self.assertEqual(query.aliases, ['authtype', 'callnum', 'exclusive', 'expired', 'master',
'start_time', 'update_time', 'user_id'])
'start_time', 'start_ts', 'update_time', 'update_ts',
'user_id'])
def test_get_session_info_details(self):
self.context.session.logged_in = True
@ -87,7 +94,9 @@ class TestGetSessionInfo(DBQueryTestCase):
self.assertEqual(query.clauses, ['expired is FALSE', 'id = %(id)i'])
self.assertEqual(query.joins, None)
self.assertEqual(query.columns, ['authtype', 'callnum', 'exclusive', 'expired', 'hostip',
'id', 'master', "date_part('epoch', start_time)",
'update_time', 'user_id'])
'id', 'master', 'start_time',
"date_part('epoch', start_time)", 'update_time',
"date_part('epoch', update_time)", 'user_id'])
self.assertEqual(query.aliases, ['authtype', 'callnum', 'exclusive', 'expired', 'hostip',
'id', 'master', 'start_time', 'update_time', 'user_id'])
'id', 'master', 'start_time', 'start_ts', 'update_time',
'update_ts', 'user_id'])