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

using ConfigParser.read_file for PY3

Browse source
This commit is contained in:
Yu Ming Zhu 2018-11-06 00:15:03 +00:00 • committed by Mike McLean
parent 8cc1c93dc2
commit 9ddae41877
6 changed files with 76 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tests/test_lib/test_utils.py
View file

@ -158,6 +158,47 @@ class MiscFunctionTestCase(unittest.TestCase):
m.assert_not_called()
class ConfigFileTestCase(unittest.TestCase):
"""Test config file reading functions"""
@mock_open()
@mock.patch("six.moves.configparser.ConfigParser", spec=True)
@mock.patch("six.moves.configparser.SafeConfigParser", spec=True)
def test_read_config_files(self, scp_clz, cp_clz, open_mock):
files = 'test1.conf'
conf = koji.read_config_files(files)
self.assertTrue(isinstance(conf,
six.moves.configparser.ConfigParser.__class__))
cp_clz.assert_called_once()
open_mock.assert_called_once_with(files, 'r')
if six.PY2:
cp_clz.return_value.readfp.assert_called_once()
else:
cp_clz.return_value.read_file.assert_called_once()
open_mock.reset_mock()
cp_clz.reset_mock()
files = ['test1.conf', 'test2.conf']
koji.read_config_files(files)
cp_clz.assert_called_once()
open_mock.assert_has_calls([call('test1.conf', 'r'),
call('test2.conf', 'r')],
any_order=True)
if six.PY2:
self.assertEqual(cp_clz.return_value.readfp.call_count, 2)
else:
self.assertEqual(cp_clz.return_value.read_file.call_count, 2)
open_mock.reset_mock()
cp_clz.reset_mock()
conf = koji.read_config_files(files,
six.moves.configparser.SafeConfigParser)
self.assertTrue(isinstance(conf,
six.moves.configparser.SafeConfigParser.__class__))
cp_clz.assert_not_called()
scp_clz.assert_called_once()
class MavenUtilTestCase(unittest.TestCase):
"""Test maven relative functions"""
maxDiff = None
@ -494,7 +535,10 @@ class MavenUtilTestCase(unittest.TestCase):
config = six.moves.configparser.ConfigParser()
path = os.path.dirname(__file__)
with open(path + cfile, 'r') as conf_file:
config.readfp(conf_file)
if six.PY2:
config.readfp(conf_file)
else:
config.read_file(conf_file)
return config
def test_formatChangelog(self):