almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

[checks] Fix tests to never use real real arch

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-03-10 18:54:14 +01:00
parent e77821987c
commit 07f5da5d4f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/checks.py
View File

@ -36,7 +36,7 @@ def is_isohybrid_needed(conf):
runroot = conf.get('runroot', False) runroot = conf.get('runroot', False)
if runroot and not _will_productimg_run(conf): if runroot and not _will_productimg_run(conf):
return False return False
if platform.machine() not in ('x86_64', 'i386'): if platform.machine() not in ('x86_64', 'i686', 'i386'):
msg = ('Not checking for /usr/bin/isohybrid due to current architecture. ' msg = ('Not checking for /usr/bin/isohybrid due to current architecture. '
'Expect failures in productimg phase.') 'Expect failures in productimg phase.')
print msg print msg

16
tests/test_checks.py
View File

@ -31,9 +31,11 @@ class CheckDependenciesTestCase(unittest.TestCase):
def test_all_deps_ok(self): def test_all_deps_ok(self):
with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out: with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out:
with mock.patch('os.path.exists') as exists: with mock.patch('platform.machine') as machine:
exists.side_effect = self.dont_find([]) machine.return_value = 'x86_64'
result = checks.check({}) with mock.patch('os.path.exists') as exists:
exists.side_effect = self.dont_find([])
result = checks.check({})
self.assertEqual('', out.getvalue()) self.assertEqual('', out.getvalue())
self.assertTrue(result) self.assertTrue(result)
@ -44,9 +46,11 @@ class CheckDependenciesTestCase(unittest.TestCase):
} }
with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out: with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out:
with mock.patch('os.path.exists') as exists: with mock.patch('platform.machine') as machine:
exists.side_effect = self.dont_find(['/usr/bin/jigdo-lite']) machine.return_value = 'x86_64'
result = checks.check(conf) with mock.patch('os.path.exists') as exists:
exists.side_effect = self.dont_find(['/usr/bin/jigdo-lite'])
result = checks.check(conf)
self.assertEqual('', out.getvalue()) self.assertEqual('', out.getvalue())
self.assertTrue(result) self.assertTrue(result)