From 7c67cc73ad30dc784f6a98abab3bfd5c5fd05ece Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 29 Jan 2019 15:47:10 -0500 Subject: [PATCH] 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-x8664 Signed-off-by: Cleber Rosa --- selftests/unit/test_utils_vmimage.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/selftests/unit/test_utils_vmimage.py b/selftests/unit/test_utils_vmimage.py index ff3448409..ac4805174 100644 --- a/selftests/unit/test_utils_vmimage.py +++ b/selftests/unit/test_utils_vmimage.py @@ -133,13 +133,13 @@ def get_html_with_image_link(image_link): 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 @@ def test_get_image_url(self, urlopen_mock): 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 @@ def test_get_image_url_defining_build(self, urlopen_mock): 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)