From 9ea5cedadb7a2799f7a09f2414b8a065f8481790 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Tue, 25 Apr 2023 17:45:05 +0000
Subject: [PATCH] Fix tests to pass on ARM. Disable others because Fedora
 doesn't support ARM video.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=598
---
 virt-manager.spec                          | 3 +++
 virtinst-enable-video-virtio-for-arm.patch | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/virt-manager.spec b/virt-manager.spec
index b2122639..be15b25c 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -246,6 +246,9 @@ donttest="$donttest or testCLI0162virt_install"
 # Expectsion <video> element
 donttest="$donttest or testCLI0168virt_install_s390x_cdrom"
 donttest="$donttest or testCLI0169virt_install_s390x_cdrom"
+# Fedora specific
+donttest="$donttest or testCLI0178virt_install_arm_defaultmach_f20"
+donttest="$donttest or testCLI0179virt_install_arm_kvm_import"
 # missing <boot> element, extra <kernel> element
 donttest="$donttest or testCLI0189virt_install_xen_default"
 donttest="$donttest or testCLI0190virt_install_xen_default"
diff --git a/virtinst-enable-video-virtio-for-arm.patch b/virtinst-enable-video-virtio-for-arm.patch
index c2911a74..bc567375 100644
--- a/virtinst-enable-video-virtio-for-arm.patch
+++ b/virtinst-enable-video-virtio-for-arm.patch
@@ -18,7 +18,7 @@ Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-aarch64-cdrom.xml
 +    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
 +      <image compression="off"/>
 +    </graphics>
-+    <sound model="ich6"/>
++    <sound model="ich9"/>
 +    <video>
 +      <model type="virtio"/>
 +    </video>
@@ -37,7 +37,7 @@ Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-aarch64-cdrom.xml
 +    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
 +      <image compression="off"/>
 +    </graphics>
-+    <sound model="ich6"/>
++    <sound model="ich9"/>
 +    <video>
 +      <model type="virtio"/>
 +    </video>
@@ -107,7 +107,7 @@ Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-aarch64-machdefaul
 +    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
 +      <image compression="off"/>
 +    </graphics>
-+    <sound model="ich6"/>
++    <sound model="ich9"/>
 +    <video>
 +      <model type="virtio"/>
 +    </video>
@@ -130,7 +130,7 @@ Index: virt-manager-4.1.0/tests/data/cli/compare/virt-install-aarch64-machvirt.x
 +    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
 +      <image compression="off"/>
 +    </graphics>
-+    <sound model="ich6"/>
++    <sound model="ich9"/>
 +    <video>
 +      <model type="virtio"/>
 +    </video>