shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

test_urls: Drop comparison against _Distro class

Browse Source 
Future changes to use libosinfo more are going to break
this. Comparing against detected os_variant should be
mostly sufficient
This commit is contained in:
Cole Robinson 2019-01-30 11:48:42 -05:00
parent 9e4287321f
commit 5df6bc2ba5
1 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/test_urls.py
View File

@ -17,15 +17,6 @@ from virtinst import Guest
from virtinst import urldetect
from virtinst import urlfetcher
from virtinst import util
from virtinst.urldetect import ALTLinuxDistro
from virtinst.urldetect import CentOSDistro
from virtinst.urldetect import DebianDistro
from virtinst.urldetect import FedoraDistro
from virtinst.urldetect import GenericTreeinfoDistro
from virtinst.urldetect import MandrivaDistro
from virtinst.urldetect import RHELDistro
from virtinst.urldetect import SuseDistro
from virtinst.urldetect import UbuntuDistro
class _URLTestData(object):
@ -39,7 +30,6 @@ class _URLTestData(object):
self.url = url
self.detectdistro = detectdistro
self.arch = self._find_arch()
self.distroclass = self._distroclass_for_name(self.name)
self.kernelarg = kernelarg
self.kernelregex = kernelregex
@ -50,30 +40,6 @@ class _URLTestData(object):
# and exercises the shortcircuit infrastructure
self.testshortcircuit = testshortcircuit
def _distroclass_for_name(self, name):
# Map the test case name to the expected urldetect distro
# class we should be detecting
if "fedora" in name:
return FedoraDistro
if "centos" in name:
return CentOSDistro
if "rhel" in name:
return RHELDistro
if "suse" in name:
return SuseDistro
if "debian" in name:
return DebianDistro
if "ubuntu" in name:
return UbuntuDistro
if "mageia" in name:
return MandrivaDistro
if "altlinux" in name:
return ALTLinuxDistro
if "generic" in name:
return GenericTreeinfoDistro
raise RuntimeError("name=%s didn't map to any distro class. Extend "
"_distroclass_for_name" % name)
def _find_arch(self):
if ("i686" in self.url or
"i386" in self.url or
@ -153,15 +119,6 @@ def _testURL(fetcher, testdata):
if not s:
continue
if not isinstance(s, testdata.distroclass):
raise AssertionError("Unexpected URLDistro class:\n"
"found = %s\n"
"expect = %s\n\n"
"testname = %s\n"
"url = %s" %
(s.__class__, testdata.distroclass, distname,
fetcher.location))
# Make sure the stores are reporting correct distro name/variant
if detectdistro != s.get_osdict_info():
raise AssertionError(
@ -169,10 +126,9 @@ def _testURL(fetcher, testdata):
"found = %s\n"
"expect = %s\n\n"
"testname = %s\n"
"url = %s\n"
"store = %s" %
"url = %s\n" %
(s.get_osdict_info(), detectdistro,
distname, fetcher.location, testdata.distroclass))
distname, fetcher.location))
# Fetch regular kernel
kernel, initrd = hvmstore.check_kernel_paths()
@ -204,9 +160,6 @@ def _fetchWrapper(url, cb):
def _testURLWrapper(testdata):
os.environ.pop("VIRTINST_TEST_SUITE", None)
logging.debug("Testing for media arch=%s distroclass=%s",
testdata.arch, testdata.distroclass)
sys.stdout.write("\nTesting %-25s " % testdata.name)
sys.stdout.flush()