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

tests: py3 versions compatibility fixes

Browse source
This commit is contained in:
Tomas Kopecek 2024-05-06 13:17:48 +02:00
parent df86feab7f
commit 5801ac8b13
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/test_lib/test_auth.py
View file

@ -54,6 +54,7 @@ class TestAuthSession(unittest.TestCase):
'DisableURLSessions': False, 'DisableURLSessions': False,
'SessionRenewalTimeout': 0, 'SessionRenewalTimeout': 0,
} }
self.context.environ = {'QUERY_STRING': 'non_session_key=1'}
with self.assertRaises(koji.GenericError) as cm: with self.assertRaises(koji.GenericError) as cm:
kojihub.auth.Session() kojihub.auth.Session()
# no args in request/environment # no args in request/environment

14
tests/test_lib/test_utils.py
View file

@ -1490,7 +1490,7 @@ class TestRmtree(unittest.TestCase):
koji.util.rmtree(path, logger) koji.util.rmtree(path, logger)
fork.assert_called_once() fork.assert_called_once()
rmtree_nofork.assert_called_once() rmtree_nofork.assert_called_once()
self.assertEqual(rmtree_nofork.mock_calls[0].args[0], path) self.assertEqual(rmtree_nofork.call_args[0][0], path)
_exit.assert_called_once() _exit.assert_called_once()
@mock.patch('koji.util._rmtree_nofork') @mock.patch('koji.util._rmtree_nofork')
@ -1511,7 +1511,7 @@ class TestRmtree(unittest.TestCase):
koji.util.rmtree(path, logger) koji.util.rmtree(path, logger)
fork.assert_called_once() fork.assert_called_once()
rmtree_nofork.assert_called_once() rmtree_nofork.assert_called_once()
self.assertEqual(rmtree_nofork.mock_calls[0].args[0], path) self.assertEqual(rmtree_nofork.call_args[0][0], path)
_exit.assert_called_once() _exit.assert_called_once()
waitpid.assert_not_called waitpid.assert_not_called
@ -1550,7 +1550,7 @@ class TestRmtree(unittest.TestCase):
koji.util.rmtree(path, logger) koji.util.rmtree(path, logger)
logsend.assert_called_once() logsend.assert_called_once()
logger.error.assert_called_once() logger.error.assert_called_once()
if not logger.error.mock_calls[0].args[0].startswith('Failed to get rmtree logs'): if not logger.error.call_args[0][0].startswith('Failed to get rmtree logs'):
raise Exception('Wrong log message') raise Exception('Wrong log message')
fork.assert_called_once() fork.assert_called_once()
rmtree_nofork.assert_not_called() rmtree_nofork.assert_not_called()
@ -1946,8 +1946,8 @@ class TestProxyLogger(unittest.TestCase):
logger = mock.MagicMock() logger = mock.MagicMock()
koji.util.SimpleProxyLogger.send(logfile, logger) koji.util.SimpleProxyLogger.send(logfile, logger)
logger.log.assert_called_once() logger.log.assert_called_once()
self.assertEqual(logger.log.mock_calls[0].args[0], logging.ERROR) self.assertEqual(logger.log.call_args[0][0], logging.ERROR)
if not logger.log.mock_calls[0].args[1].startswith('Unable to log'): if not logger.log.call_args[0][1].startswith('Unable to log'):
raise Exception('Wrong error message') raise Exception('Wrong error message')
def test_proxy_logger_bad_line(self): def test_proxy_logger_bad_line(self):
@ -1957,8 +1957,8 @@ class TestProxyLogger(unittest.TestCase):
logger = mock.MagicMock() logger = mock.MagicMock()
koji.util.SimpleProxyLogger.send(logfile, logger) koji.util.SimpleProxyLogger.send(logfile, logger)
logger.log.assert_called_once() logger.log.assert_called_once()
self.assertEqual(logger.log.mock_calls[0].args[0], logging.ERROR) self.assertEqual(logger.log.call_args[0][0], logging.ERROR)
if not logger.log.mock_calls[0].args[1].startswith('Bad log data: '): if not logger.log.call_args[0][1].startswith('Bad log data: '):
raise Exception('Wrong error message') raise Exception('Wrong error message')
def test_proxy_logger_repr_fail(self): def test_proxy_logger_repr_fail(self):