From 3a4029a097bfce6d292223f2aab1548cbc5b8f4d Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Tue, 7 Jan 2025 13:31:16 +0100 Subject: [PATCH] Update py2 tests Py2 test updates for https://pagure.io/koji/pull-request/4214 Related: https://pagure.io/koji/issue/4248 --- tests/test_lib/test_utils.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tests/test_lib/test_utils.py b/tests/test_lib/test_utils.py index f93f7f5a..a9abf824 100644 --- a/tests/test_lib/test_utils.py +++ b/tests/test_lib/test_utils.py @@ -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)