[13/39] tests/functional: don't try to wait for the empty string

Commit Message

Alex Bennée Nov. 21, 2024, 4:57 p.m. UTC

From: Daniel P. Berrangé <[e-mail]>

Telling exec_command_wand_wait_for_pattern to wait for the empty
string does not make any conceptual sense, as a check for empty
string will always succeed. It makes even less sense when followed
by a call to wait_for_console_pattern() with a real match.

Signed-off-by: Daniel P. Berrangé <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Alex Bennée <[e-mail]>
---
 tests/functional/test_virtio_gpu.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Thomas Huth Nov. 21, 2024, 7:04 p.m. UTC | #1

On 21/11/2024 17.57, Alex Bennée wrote:
> From: Daniel P. Berrangé <[e-mail]>
> 
> Telling exec_command_wand_wait_for_pattern to wait for the empty
> string does not make any conceptual sense, as a check for empty
> string will always succeed. It makes even less sense when followed
> by a call to wait_for_console_pattern() with a real match.
> 
> Signed-off-by: Daniel P. Berrangé <[e-mail]>
> Message-Id: <[e-mail]>
> Signed-off-by: Alex Bennée <[e-mail]>
> ---
>   tests/functional/test_virtio_gpu.py | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Thomas Huth <[e-mail]>

Patch

diff --git a/tests/functional/test_virtio_gpu.py b/tests/functional/test_virtio_gpu.py
index 441cbdcf2d..d5027487ac 100755
--- a/tests/functional/test_virtio_gpu.py
+++ b/tests/functional/test_virtio_gpu.py
@@ -80,9 +80,8 @@  def test_virtio_vga_virgl(self):
 
         self.wait_for_console_pattern("as init process")
         exec_command_and_wait_for_pattern(
-            self, "/usr/sbin/modprobe virtio_gpu", ""
+            self, "/usr/sbin/modprobe virtio_gpu", "features: +virgl +edid"
         )
-        self.wait_for_console_pattern("features: +virgl +edid")
 
     def test_vhost_user_vga_virgl(self):
         # FIXME: should check presence of vhost-user-gpu, virgl, memfd etc