tests/functional: don't try to wait for the empty string
authorDaniel P. Berrangé <berrange@redhat.com>
Thu, 21 Nov 2024 16:57:40 +0000 (16:57 +0000)
committerAlex Bennée <alex.bennee@linaro.org>
Mon, 25 Nov 2024 10:13:41 +0000 (10:13 +0000)
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é <berrange@redhat.com>
Message-Id: <20241121154218.1423005-14-berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20241121165806.476008-14-alex.bennee@linaro.org>

tests/functional/test_virtio_gpu.py

index 441cbdcf2d2f8691bf061cee248a1d4a1408b9b5..d5027487ac4fa46b1f53a2a058d5d7ac380ef514 100755 (executable)
@@ -80,9 +80,8 @@ class VirtioGPUx86(QemuSystemTest):
 
         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