From f4cd25450b635f2f8ce8a535d0207758dfeee2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 25 Oct 2016 15:25:56 +0200 Subject: [PATCH] checks: Update tests to not require python modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way the tests are more independent of the system they are running on. Merges: #447 Signed-off-by: Lubomír Sedlář --- tests/test_checks.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/test_checks.py b/tests/test_checks.py index d39dbf86..d4d8a4fa 100755 --- a/tests/test_checks.py +++ b/tests/test_checks.py @@ -38,7 +38,8 @@ class CheckDependenciesTestCase(unittest.TestCase): machine.return_value = 'x86_64' with mock.patch('os.path.exists') as exists: exists.side_effect = self.dont_find([]) - result = checks.check({}) + with mock.patch('__builtin__.__import__'): + result = checks.check({}) self.assertEqual('', out.getvalue()) self.assertTrue(result) @@ -53,7 +54,8 @@ class CheckDependenciesTestCase(unittest.TestCase): machine.return_value = 'x86_64' with mock.patch('os.path.exists') as exists: exists.side_effect = self.dont_find(['/usr/bin/jigdo-lite']) - result = checks.check(conf) + with mock.patch('__builtin__.__import__'): + result = checks.check(conf) self.assertEqual('', out.getvalue()) self.assertTrue(result) @@ -68,7 +70,8 @@ class CheckDependenciesTestCase(unittest.TestCase): with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out: with mock.patch('os.path.exists') as exists: exists.side_effect = self.dont_find(['/usr/bin/isohybrid']) - result = checks.check(conf) + with mock.patch('__builtin__.__import__'): + result = checks.check(conf) self.assertEqual('', out.getvalue()) self.assertTrue(result) @@ -82,7 +85,8 @@ class CheckDependenciesTestCase(unittest.TestCase): with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out: with mock.patch('os.path.exists') as exists: exists.side_effect = self.dont_find(['/usr/bin/isohybrid']) - result = checks.check(conf) + with mock.patch('__builtin__.__import__'): + result = checks.check(conf) self.assertEqual('', out.getvalue()) self.assertTrue(result) @@ -99,7 +103,8 @@ class CheckDependenciesTestCase(unittest.TestCase): machine.return_value = 'armhfp' with mock.patch('os.path.exists') as exists: exists.side_effect = self.dont_find(['/usr/bin/isohybrid']) - result = checks.check(conf) + with mock.patch('__builtin__.__import__'): + result = checks.check(conf) self.assertRegexpMatches(out.getvalue(), r'^Not checking.*Expect failures.*$') self.assertTrue(result) @@ -112,7 +117,8 @@ class CheckDependenciesTestCase(unittest.TestCase): with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out: with mock.patch('os.path.exists') as exists: exists.side_effect = self.dont_find(['/usr/bin/isohybrid']) - result = checks.check(conf) + with mock.patch('__builtin__.__import__'): + result = checks.check(conf) self.assertEqual('', out.getvalue()) self.assertTrue(result) @@ -125,7 +131,8 @@ class CheckDependenciesTestCase(unittest.TestCase): with mock.patch('sys.stdout', new_callable=StringIO.StringIO) as out: with mock.patch('os.path.exists') as exists: exists.side_effect = self.dont_find(['/usr/bin/genisoimage']) - result = checks.check(conf) + with mock.patch('__builtin__.__import__'): + result = checks.check(conf) self.assertEqual('', out.getvalue()) self.assertTrue(result)