From patchwork Thu Nov 21 16:57:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13882181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7944D78799 for ; Thu, 21 Nov 2024 17:14:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tEAWP-0005Ya-Dq; Thu, 21 Nov 2024 11:59:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tEAVm-0004lh-FV for qemu-devel@nongnu.org; Thu, 21 Nov 2024 11:58:35 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tEAVW-00083m-1S for qemu-devel@nongnu.org; Thu, 21 Nov 2024 11:58:34 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3823cf963f1so681202f8f.1 for ; Thu, 21 Nov 2024 08:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732208296; x=1732813096; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nh1HSCE0LYEGDQ7X1d/mpdCNk3qVcIIVFU2nc2OFGiU=; b=ZKHge06xXU6MZrVT9TqS6+IbdPLQp1KUiJnIQKDsDHCJqp6cdjshAZdiRBL63CMzpb bZS3DETY776OCU2HIFes4MDXlPSOlWiyuatX40GXzcteSYTLT9jt3K5MhVSdCAlt5MKr Fu0+NEB9u0N93S7Ua182Nnl5zn5EsHyyCesKOodmesn34bdhfBFGjTuuPiPuGJs/3ryI wMhZ6kzfZe12RJtWSZ4Ys6SUQs/M2FzPQ/bMiyredIFKdqeXwoXVsd5SOT0VyvABR31F Nv9rck7eQenBXK798SrJ28FZ6ba0Ukwk9C52INTg2JyJap1xF83UHHnPwI+Pj7feUD4N NE/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732208296; x=1732813096; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nh1HSCE0LYEGDQ7X1d/mpdCNk3qVcIIVFU2nc2OFGiU=; b=NIgifisSNAw8BEhDu3Vh5BZZ+hvt0VZvGoe4DRudytUHB8dG0CRIWjCXmSeg/A1jbC nhfxdsjyj1/StnF+kiRQ2CjyGdbGv4V1TMyzfULNRpv0YrRlLcHZLYEhwdyQRTQRQNhB WGOmdI51/LAo8ysQhzlXif9Bt/3mjklocm2c6Btfk5Sa6JWgg+RUpuVHzJKgJJfqpAn1 xNr9o1bZOymAR49FfcUy/Yc3bUYqdLczIt7SsB9VKNgM098OYtRX0rnzLBUistE3fQcQ QZ4HMY4zGa1zm2Boc8cbd7+OWzQ/rzXj8BizDX9NsXfYqp31iYZBzb1eqbI5SjtRcYg4 pfyA== X-Gm-Message-State: AOJu0YxAjk+fqyxL/ETso9QizdTBH44aVXVjVhRvLHUhUbkyoRClbdiU CG+syaIc4NwGQr/eQPd38BqKfwOjNgqZAX3CvSZbQYix1O+zGGKuv+BsGvTozh8= X-Gm-Gg: ASbGncs8vkWvc2R3xmRrjjacQs64tqt0blHlhcmvEX9thr2y/al6QcQa4Xca7OQlCWF +uwH5F5qsIq8eK9yqA4MRm5aGnxfMGxqCXxMg3BN2bhCzABmPlK3Z77+qZykge8dFV+RnpaKEdC /wXP0mbp+TywPtrw/MfYCV1CdaOIX4NoWkNIvJQVabAT/VJBKaZwuFg3ER7+NTvqE1GITI4G/Uq Z7NU7KVpXt1VsmP6+Y+F3MgRARSLQyKhi6igWdTMFUiPFSF X-Google-Smtp-Source: AGHT+IFMIRIvLgYx/NGn8gGlDiVz6YLvmj7b0egaaZ7PnQ+VQYm4uHamdyPY85H4BIrE6JL/kr+Z0w== X-Received: by 2002:a5d:6489:0:b0:382:4ff5:61f with SMTP id ffacd0b85a97d-38254b28759mr6329427f8f.59.1732208295832; Thu, 21 Nov 2024 08:58:15 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3825fb25d74sm31746f8f.47.2024.11.21.08.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 08:58:14 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A119E603D2; Thu, 21 Nov 2024 16:58:07 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , "Michael S. Tsirkin" , Daniel Henrique Barboza , Pierrick Bouvier , Harsh Prateek Bora , Marcel Apfelbaum , Jiaxun Yang , Halil Pasic , Christian Borntraeger , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Alexandre Iooss , qemu-riscv@nongnu.org, Thomas Huth , Bernhard Beschow , Thomas Huth , Eric Farman , Bin Meng , qemu-s390x@nongnu.org, Niek Linnenbank , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , John Snow , Wainer dos Santos Moschetta , Cleber Rosa , qemu-rust@nongnu.org, Nicholas Piggin , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Palmer Dabbelt , Markus Armbruster , Weiwei Li , Mahmoud Mandour , Mark Cave-Ayland , Liu Zhiwei , Aurelien Jarno , Ani Sinha , Alistair Francis Subject: [PATCH 13/39] tests/functional: don't try to wait for the empty string Date: Thu, 21 Nov 2024 16:57:40 +0000 Message-Id: <20241121165806.476008-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241121165806.476008-1-alex.bennee@linaro.org> References: <20241121165806.476008-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Daniel P. Berrangé 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é Message-Id: <20241121154218.1423005-14-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/functional/test_virtio_gpu.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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