diff mbox series

[v1,6/6] tests/acceptance: allow a "graceful" failing for virtio-gpu test

Message ID 20210217121932.19986-7-alex.bennee@linaro.org
State Superseded
Headers show
Series my current testing/next queue (meson/gitlab/fedora bump) | expand

Commit Message

Alex Bennée Feb. 17, 2021, 12:19 p.m. UTC
This is a band-aid with a TODO for cases when QEMU doesn't start due
to missing VirGL. Longer term we could do with some proper feature
probing.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/acceptance/virtio-gpu.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
2.20.1

Comments

Marc-André Lureau Feb. 17, 2021, 1:20 p.m. UTC | #1
On Wed, Feb 17, 2021 at 4:19 PM Alex Bennée <alex.bennee@linaro.org> wrote:

> This is a band-aid with a TODO for cases when QEMU doesn't start due

> to missing VirGL. Longer term we could do with some proper feature

> probing.

>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>

>


Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


---
>  tests/acceptance/virtio-gpu.py | 7 ++++++-

>  1 file changed, 6 insertions(+), 1 deletion(-)

>

> diff --git a/tests/acceptance/virtio-gpu.py

> b/tests/acceptance/virtio-gpu.py

> index ab1a4c1a71..ab18cddbb7 100644

> --- a/tests/acceptance/virtio-gpu.py

> +++ b/tests/acceptance/virtio-gpu.py

> @@ -85,7 +85,12 @@ def test_virtio_vga_virgl(self):

>              "-append",

>              kernel_command_line,

>          )

> -        self.vm.launch()

> +        try:

> +            self.vm.launch()

> +        except:

> +            # 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", ""

> --

> 2.20.1

>

>
<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Feb 17, 2021 at 4:19 PM Alex Bennée &lt;<a href="mailto:alex.bennee@linaro.org">alex.bennee@linaro.org</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This is a band-aid with a TODO for cases when QEMU doesn&#39;t start due<br>
to missing VirGL. Longer term we could do with some proper feature<br>
probing.<br>
<br>
Signed-off-by: Alex Bennée &lt;<a href="mailto:alex.bennee@linaro.org" target="_blank">alex.bennee@linaro.org</a>&gt;<br>

Cc: Marc-André Lureau &lt;<a href="mailto:marcandre.lureau@redhat.com" target="_blank">marcandre.lureau@redhat.com</a>&gt;<br></blockquote><div><br></div><div>Reviewed-by: Marc-André Lureau &lt;<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>&gt;  <br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
 tests/acceptance/virtio-gpu.py | 7 ++++++-<br>
 1 file changed, 6 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/tests/acceptance/virtio-gpu.py b/tests/acceptance/virtio-gpu.py<br>
index ab1a4c1a71..ab18cddbb7 100644<br>
--- a/tests/acceptance/virtio-gpu.py<br>
+++ b/tests/acceptance/virtio-gpu.py<br>
@@ -85,7 +85,12 @@ def test_virtio_vga_virgl(self):<br>
             &quot;-append&quot;,<br>
             kernel_command_line,<br>
         )<br>
-        self.vm.launch()<br>
+        try:<br>
+            self.vm.launch()<br>
+        except:<br>
+            # TODO: probably fails because we are missing the VirGL features<br>
+            self.cancel(&quot;VirGL not enabled?&quot;)<br>
+<br>
         self.wait_for_console_pattern(&quot;as init process&quot;)<br>
         exec_command_and_wait_for_pattern(<br>
             self, &quot;/usr/sbin/modprobe virtio_gpu&quot;, &quot;&quot;<br>
-- <br>
2.20.1<br>
<br>
</blockquote></div></div>
Willian Rampazzo Feb. 19, 2021, 3:53 p.m. UTC | #2
On Wed, Feb 17, 2021 at 9:21 AM Alex Bennée <alex.bennee@linaro.org> wrote:
>

> This is a band-aid with a TODO for cases when QEMU doesn't start due

> to missing VirGL. Longer term we could do with some proper feature

> probing.

>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---

>  tests/acceptance/virtio-gpu.py | 7 ++++++-

>  1 file changed, 6 insertions(+), 1 deletion(-)

>


Reviewed-by: Willian Rampazzo <willianr@redhat.com>
diff mbox series

Patch

diff --git a/tests/acceptance/virtio-gpu.py b/tests/acceptance/virtio-gpu.py
index ab1a4c1a71..ab18cddbb7 100644
--- a/tests/acceptance/virtio-gpu.py
+++ b/tests/acceptance/virtio-gpu.py
@@ -85,7 +85,12 @@  def test_virtio_vga_virgl(self):
             "-append",
             kernel_command_line,
         )
-        self.vm.launch()
+        try:
+            self.vm.launch()
+        except:
+            # 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", ""