PR#4292: Update py2 tests - koji

koji

#4292 Update py2 tests

Merged 11 months ago by tkopecek. Opened 11 months ago by tkopecek.

tkopecek/koji issue4248a into master

Update py2 tests

Tomas Kopecek • 11 months ago

a31b4b2

tests/test_lib/test_utils.py

file modified

+20 -8

		`@@ -247,6 +247,7 @@`
		`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 @@`
		`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 @@`
		`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 @@`
		`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)`