robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port to Python 3

Browse source 
This should make all tests pass on both Python 2 and Python 3.

Unittest2 is required on Py 2.6 and Py 3.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-09-05 10:01:21 +02:00
parent 3088df8e60
commit ed22e07ef9
50 changed files with 203 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/test_createrepophase.py
View file

@ -715,6 +715,7 @@ class ANYSingleton(object):
def __repr__(self):
return u'ANY'
ANY = ANYSingleton()
@ -728,7 +729,7 @@ class TestGetProductIds(PungiTestCase):
def assertProductIds(self, mapping):
pids = glob.glob(self.compose.paths.work.product_id('*', '*'))
expected = set()
for variant, arches in mapping.iteritems():
for variant, arches in mapping.items():
for arch in arches:
expected.add(os.path.join(self.topdir, 'work', arch,
'product_id',
@ -800,8 +801,8 @@ class TestGetProductIds(PungiTestCase):
get_productids_from_scm(self.compose)
self.assertEqual(get_dir_from_scm.call_args_list, [mock.call(cfg, ANY)])
self.assertEqual(str(ctx.exception),
'No product certificate found (arch: amd64, variant: Everything)')
self.assertRegex(str(ctx.exception),
r'No product certificate found \(arch: amd64, variant: (Everything|Client)\)')
@mock.patch('pungi.phases.createrepo.get_dir_from_scm')
def test_multiple_matching(self, get_dir_from_scm):
@ -822,8 +823,8 @@ class TestGetProductIds(PungiTestCase):
get_productids_from_scm(self.compose)
self.assertEqual(get_dir_from_scm.call_args_list, [mock.call(cfg, ANY)])
self.assertRegexpMatches(str(ctx.exception),
'Multiple product certificates found.+')
self.assertRegex(str(ctx.exception),
'Multiple product certificates found.+')
if __name__ == "__main__":