diff options
| author | Cole Robinson <crobinso@redhat.com> | 2022-06-13 12:59:44 -0400 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2022-06-13 13:20:01 -0400 |
| commit | 0533bb8189c2d36fc18121bf394be5d35c038066 (patch) | |
| tree | e2e7fec484415819e73a029a1a93d5c79725eae2 /tests | |
| parent | 34662fecc9535c7d8d0a8e7d42fafa4b9e005c89 (diff) | |
| download | virt-manager-0533bb8189c2d36fc18121bf394be5d35c038066.tar.gz | |
tests: Fix with latest osinfo-db
linux2020 is now reporting virtio-gpu support, adjust output and
add a compat check
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/cli/compare/virt-install-linux2020.xml | 4 | ||||
| -rw-r--r-- | tests/test_cli.py | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/data/cli/compare/virt-install-linux2020.xml b/tests/data/cli/compare/virt-install-linux2020.xml index cd3e8bb4..5a7d7adf 100644 --- a/tests/data/cli/compare/virt-install-linux2020.xml +++ b/tests/data/cli/compare/virt-install-linux2020.xml @@ -71,7 +71,7 @@ </graphics> <sound model="ich9"/> <video> - <model type="qxl"/> + <model type="virtio"/> </video> <redirdev bus="usb" type="spicevmc"/> <redirdev bus="usb" type="spicevmc"/> @@ -154,7 +154,7 @@ </graphics> <sound model="ich9"/> <video> - <model type="qxl"/> + <model type="virtio"/> </video> <redirdev bus="usb" type="spicevmc"/> <redirdev bus="usb" type="spicevmc"/> diff --git a/tests/test_cli.py b/tests/test_cli.py index 6a0df787..02843b10 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -117,6 +117,11 @@ def no_osinfo_unattended_win_drivers_cb(): return "osinfo is too old for this win7 unattended test" +def no_osinfo_linux2020_virtio(): + linux2020 = OSDB.lookup_os("linux2020") + return not linux2020 or not linux2020.supports_virtiogpu() + + ###################### # Test class helpers # ###################### @@ -1080,7 +1085,7 @@ c.add_compare("--os-variant http://fedoraproject.org/fedora/20 --disk %(EXISTIMG c.add_compare("--cdrom %(EXISTIMG2)s --file %(EXISTIMG1)s --os-variant win2k3 --sound --controller usb", "kvm-win2k3-cdrom") # HVM windows install with disk c.add_compare("--os-variant name=ubuntusaucy --nodisks --boot cdrom --virt-type qemu --cpu Penryn --input tablet --boot uefi --graphics vnc", "qemu-plain") # plain qemu c.add_compare("--os-variant fedora20 --nodisks --boot network --graphics default --arch i686 --rng none", "qemu-32-on-64", prerun_check=has_old_osinfo) # 32 on 64 -c.add_compare("--osinfo linux2020 --pxe", "linux2020", prerun_check=lambda: not OSDB.lookup_os("linux2020")) +c.add_compare("--osinfo linux2020 --pxe", "linux2020", prerun_check=no_osinfo_linux2020_virtio) c.add_compare("--osinfo generic --disk none --location %(ISO-NO-OS)s,kernel=frib.img,initrd=/frob.img", "location-manual-kernel", prerun_check=missing_xorriso) # --location with an unknown ISO but manually specified kernel paths c.add_compare("--disk %(EXISTIMG1)s --location %(ISOTREE)s --nonetworks", "location-iso", prerun_check=missing_xorriso) # Using --location iso mounting c.add_compare("--disk %(EXISTIMG1)s --cdrom %(ISOLABEL)s", "cdrom-centos-label") # Using --cdrom with centos CD label, should use virtio etc. |