tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support

[PATCH] tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support

Thomas Huth posted 1 patch 1 year ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231114203456.319093-1-thuth@redhat.com

Maintainers: Cleber Rosa <crosa@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>

tests/avocado/virtio-gpu.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

Expand all Fold all

[PATCH] tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support

Posted by Thomas Huth 1 year ago

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).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/avocado/virtio-gpu.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 @@ def test_vhost_user_vga_virgl(self):
             # 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()
-- 
2.41.0

Re: [PATCH] tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support

Posted by Antonio Caggiano 1 year ago

Hi,

On 14/11/2023 21:34, Thomas Huth wrote:
> 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).
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Antonio Caggiano <quic_acaggian@quicinc.com>

> ---
>   tests/avocado/virtio-gpu.py | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> 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 @@ def test_vhost_user_vga_virgl(self):
>               # 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()