From: Thomas Huth Date: Tue, 14 Nov 2023 20:34:56 +0000 (+0100) Subject: tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support X-Git-Tag: pull-xen-20240312~165^2~7 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ffab603bd513130472faf641326d1d387cbf6526;p=people%2Faperard%2Fqemu-dm.git tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support The "edid" feature has been added to vhost-user-gpu in commit c06444261e20 ("contrib/vhost-user-gpu: implement get_edid feature"), so waiting for "features: +virgl -edid" in the test does not work anymore, it's "+edid" instead of "-edid" now! While we're at it, move the expected string to the preceeding exec_command_and_wait_for_pattern() instead (since waiting for empty string here does not make too much sense). Message-ID: <20231114203456.319093-1-thuth@redhat.com> Reviewed-by: Antonio Caggiano Signed-off-by: Thomas Huth --- diff --git a/tests/avocado/virtio-gpu.py b/tests/avocado/virtio-gpu.py index 89bfecc715..6091f614a4 100644 --- a/tests/avocado/virtio-gpu.py +++ b/tests/avocado/virtio-gpu.py @@ -149,10 +149,8 @@ class VirtioGPUx86(QemuSystemTest): # TODO: probably fails because we are missing the VirGL features self.cancel("VirGL not enabled?") self.wait_for_console_pattern("as init process") - exec_command_and_wait_for_pattern( - self, "/usr/sbin/modprobe virtio_gpu", "" - ) - self.wait_for_console_pattern("features: +virgl -edid") + exec_command_and_wait_for_pattern(self, "/usr/sbin/modprobe virtio_gpu", + "features: +virgl +edid") self.vm.shutdown() qemu_sock.close() vugp.terminate()