shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-10 01:18:03 +03:00
Code Issues Projects Releases Wiki Activity

test_urls: Improve error reporting

Browse Source
This commit is contained in:
Cole Robinson 2016-03-24 14:55:27 -04:00
parent af5a86742c
commit fdfddff6a4
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/test_urls.py
View File

@ -211,7 +211,10 @@ def _testURL(fetcher, distname, arch, distroobj):
Test that our URL detection logic works for grabbing kernel, xen
kernel, and boot.iso
"""
print "\nTesting %s-%s" % (distname, arch)
import sys
sys.stdout.write("\nTesting %-25s " % ("%s-%s:" % (distname, arch)))
sys.stdout.flush()
hvmguest.os.arch = arch
xenguest.os.arch = arch
if distroobj.testshortcircuit:
@ -226,16 +229,26 @@ def _testURL(fetcher, distname, arch, distroobj):
for s in [hvmstore, xenstore]:
if (s and distroobj.distroclass and
not isinstance(s, distroobj.distroclass)):
raise AssertionError("(%s): expected store %s, was %s" %
(distname, distroobj.distroclass, s))
raise AssertionError("Unexpected URLDistro class:\n"
"found = %s\n"
"expect = %s\n"
"name = %s\n"
"url = %s" %
(s.__class__, distroobj.distroclass, distname,
fetcher.location))
# Make sure the stores are reporting correct distro name/variant
if (s and distroobj.detectdistro and
distroobj.detectdistro != s.os_variant):
raise AssertionError(
"Store distro/variant did not match expected values:\n"
"url=%s\nstore=%s\nfound=%s\nexpect=%s" %
(fetcher.location, s, s.os_variant, distroobj.detectdistro))
"Detected OS did not match expected values:\n"
"found = %s\n"
"expect = %s\n"
"name = %s\n"
"url = %s\n"
"store = %s" %
(s.os_variant, distroobj.detectdistro,
distname, fetcher.location, distroobj.distroclass))
# Do this only after the distro detection, since we actually need
# to fetch files for that part