提交 7c67cc73 编写于 作者: C Cleber Rosa

selftests/unit/test_utils_vmimage.py: do not depend on host arch

Some tests for the vmimage module do not specify the arch to use to
determine the image that will (would) be fetched.  It then relies on
the default of using the host arch.  But, if the test is run on a host
arch different than x86_64, the test will fail.

Let's make the test more deterministic by providing the arch parameter
value.

Reference: https://trello.com/c/92VQRMoC/1483-vmimage-tests-fail-under-x8664Signed-off-by: NCleber Rosa <crosa@redhat.com>
上级 8be7c4fb
......@@ -133,13 +133,13 @@ class OpenSUSEImageProvider(unittest.TestCase):
def test_get_best_version_default(self):
suse_latest_version = 15.0
suse_provider = vmimage.OpenSUSEImageProvider()
suse_provider = vmimage.OpenSUSEImageProvider(arch='x86_64')
self.assertEqual(suse_provider.get_best_version(self.suse_available_versions),
suse_latest_version)
def test_get_best_version_leap_4_series(self):
suse_latest_version = 42.3
suse_provider = vmimage.OpenSUSEImageProvider(version='4(.)*')
suse_provider = vmimage.OpenSUSEImageProvider(version='4(.)*', arch='x86_64')
self.assertEqual(suse_provider.get_best_version(self.suse_available_versions),
suse_latest_version)
......@@ -151,7 +151,7 @@ class OpenSUSEImageProvider(unittest.TestCase):
urlopen_mock.return_value = mock.Mock(read=urlread_mocked)
expected_image_url = self.base_images_url + image
suse_provider = vmimage.OpenSUSEImageProvider()
suse_provider = vmimage.OpenSUSEImageProvider(arch='x86_64')
suse_provider.get_version = mock.Mock(return_value='15.0')
self.assertEqual(suse_provider.get_image_url(), expected_image_url)
......@@ -163,7 +163,8 @@ class OpenSUSEImageProvider(unittest.TestCase):
urlopen_mock.return_value = mock.Mock(read=urlread_mocked)
expected_image_url = self.base_images_url + image
suse_provider = vmimage.OpenSUSEImageProvider(build='1.1.1-Buildlp111.11.11')
suse_provider = vmimage.OpenSUSEImageProvider(build='1.1.1-Buildlp111.11.11',
arch='x86_64')
suse_provider.get_version = mock.Mock(return_value='15.0')
self.assertEqual(suse_provider.get_image_url(), expected_image_url)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册