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

unittest: enabling tests/test_lib for py2

Browse source
This commit is contained in:
Yuming Zhu 2024-10-22 23:51:50 +08:00 • committed by Tomas Kopecek
parent 51d8535eee
commit c8a27e525a
8 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/test_lib/test_utils.py
View file

@ -758,7 +758,7 @@ class MavenUtilTestCase(unittest.TestCase):
def _read_conf(self, cfile):
path = os.path.dirname(__file__)
with open(path + cfile, 'rt', encoding='utf-8') as conf_file:
with open(path + cfile, 'rt') as conf_file:
if six.PY2:
config = six.moves.configparser.SafeConfigParser()
config.readfp(conf_file)
@ -1513,7 +1513,10 @@ class TestRmtree(unittest.TestCase):
rmtree_nofork.assert_called_once()
self.assertEqual(rmtree_nofork.call_args[0][0], path)
_exit.assert_called_once()
logger = rmtree_nofork.call_args.kwargs['logger']
if mock.__package__ == 'unittest':
logger = rmtree_nofork.call_args.kwargs['logger']
else:
logger = rmtree_nofork.call_args[1]['logger']
@mock.patch('tempfile.mkstemp') # avoid stray temp file
@mock.patch('koji.util._rmtree_nofork')