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

backport py27 compatible file open with encoding

Browse source 
client and builder needs to run on py27 which doesn't support
open(encoding='utf-8')

Related: https://pagure.io/koji/issue/2641
This commit is contained in:
Tomas Kopecek 2021-02-12 15:34:26 +01:00
parent 9e376a22b0
commit c6e69b4f8b
10 changed files with 62 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/test_plugins/test_runroot_builder.py
View file

@ -13,14 +13,6 @@ __main__.BuildRoot = kojid.BuildRoot
import koji
import runroot
def mock_open():
"""Return the right patch decorator for open"""
if six.PY2:
return mock.patch('__builtin__.open')
else:
return mock.patch('builtins.open')
if six.PY2:
CONFIG_PARSER = 'six.moves.configparser.SafeConfigParser'
else:
@ -192,7 +184,7 @@ class TestMounts(unittest.TestCase):
self.assertEqual(self.t._get_path_params('/mnt/archive', 'rw'),
('archive.org:/vol/archive/', '/mnt/archive', 'nfs', 'rw,hard,intr,nosuid,nodev,noatime,tcp'))
@mock_open()
@mock.patch('koji._open_text_file')
@mock.patch('os.path.isdir')
@mock.patch('runroot.log_output')
def test_do_mounts(self, log_output, is_dir, open_mock):
@ -293,7 +285,7 @@ class TestMounts(unittest.TestCase):
self.t.do_mounts.assert_not_called()
@mock_open()
@mock.patch('koji._open_text_file')
@mock.patch('runroot.scan_mounts')
@mock.patch('os.unlink')
@mock.patch('subprocess.Popen')