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

Update py2 tests

Browse source 
Py2 test updates for https://pagure.io/koji/pull-request/4214

Related: https://pagure.io/koji/issue/4248
This commit is contained in:
Tomas Kopecek 2025-01-07 13:31:16 +01:00
parent 251a40facc
commit 3a4029a097
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tests/test_lib/test_utils.py
View file

@ -247,6 +247,7 @@ class ConfigFileTestCase(unittest.TestCase):
if six.PY2:
self.manager.scp_clz = mock.patch("ConfigParser.SafeConfigParser",
spec=True).start()
mock.patch('codecs.open').start()
else:
self.manager.cp_clz = mock.patch("configparser.ConfigParser",
spec=True).start()
@ -297,7 +298,11 @@ class ConfigFileTestCase(unittest.TestCase):
self.assertTrue(isinstance(conf,
six.moves.configparser.ConfigParser.__class__))
self.real_parser_clz.assert_called_once()
self.real_parser_clz.return_value.read.assert_called_once_with([files], encoding='utf8')
if six.PY2:
self.real_parser_clz.return_value.read.assert_not_called()
self.real_parser_clz.return_value.readfp.assert_called_once()
else:
self.real_parser_clz.return_value.read.assert_called_once_with([files], encoding='utf8')
# list as config_files
self.reset_mock()
@ -305,7 +310,11 @@ class ConfigFileTestCase(unittest.TestCase):
koji.read_config_files(files)
self.real_parser_clz.assert_called_once()
self.real_parser_clz.return_value.read.assert_called_once_with(files, encoding='utf8')
if six.PY2:
self.real_parser_clz.return_value.read.assert_not_called()
self.real_parser_clz.return_value.readfp.assert_called()
else:
self.real_parser_clz.return_value.read.assert_called()
# tuple as config_files
self.reset_mock()
@ -364,12 +373,15 @@ class ConfigFileTestCase(unittest.TestCase):
conf = koji.read_config_files(files)
listdir_mock.assert_has_calls([call('gooddir'), call('emptydir')])
self.real_parser_clz.assert_called_once()
self.real_parser_clz.return_value.read.assert_called_once_with(
['test1.conf',
'gooddir/test1-1.conf',
'gooddir/test1-2.conf',
'test2.conf'],
encoding='utf8')
if six.PY2:
self.real_parser_clz.return_value.readfp.assert_called()
else:
self.real_parser_clz.return_value.read.assert_called_once_with(
['test1.conf',
'gooddir/test1-1.conf',
'gooddir/test1-2.conf',
'test2.conf'],
encoding='utf8')
self.assertEqual(self.manager.isdir.call_count, 5)
self.assertEqual(self.manager.isfile.call_count, 6)
self.assertEqual(self.manager.access.call_count, 4)