From nobody Wed Nov 27 06:26:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699994146; cv=none; d=zohomail.com; s=zohoarc; b=nWfAb4davJSzda9nZg80ekvcxH7O9hP/gyXqZQc96SgBre4dg9GiX8Nn2SJqvMIGXAMMlzGXjQ5EkVeffBzfbbf4LN0d1Jf6MKzXhAGohYL+5nG6AB0aOH6L9yI7YF2o5fTp4Gk9eArU3ng6hr0JTL/r2pYJmUbr4yAkcV4esgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699994146; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QjukFoN8XHyFxKdZj8W+Exx+V4bd7SDF/PNDY0yXmtU=; b=B6af66LGx65oHAlOsWrbx66bOLmvpvss2FgnUUc5HXBqTeNl2bZ5pGkehbTJ5fXT7NMyNNnaCJL02D6ayGiEG/ZHhVj5PKCdMpbbzlJRtzexZFNa7mkCcEtq0TVFKdojKvdfSAtgIqsANxBKweuF8DmUv4P5l7508FwNWgLJGfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699994146868622.7755884054474; Tue, 14 Nov 2023 12:35:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r307p-0005fW-NK; Tue, 14 Nov 2023 15:35:11 -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 1r307m-0005Z4-FZ for qemu-devel@nongnu.org; Tue, 14 Nov 2023 15:35:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r307k-0002lA-Bx for qemu-devel@nongnu.org; Tue, 14 Nov 2023 15:35:05 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-59-XzG-Ba0oP7as9egd5XqR7w-1; Tue, 14 Nov 2023 15:34:59 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4DEDC101A598; Tue, 14 Nov 2023 20:34:59 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 526B25028; Tue, 14 Nov 2023 20:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699994103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=QjukFoN8XHyFxKdZj8W+Exx+V4bd7SDF/PNDY0yXmtU=; b=Ctm4uJ/dTwcHnyP4p/g7KgP/uIEld1a/Dbv9w0CcDu7vuJLPiNgPTxpwSs64vnLgq+l8rj hcZEO4qmO7YMs9Q1e9iUfIcMmXJD3cZ60+ssxtM60T4jr6Jw+hE4oZ1+Zq0pZ12aiKFpRR Zfd3bHZW27YsTxmlbdZaRwFSgsO7K7w= X-MC-Unique: XzG-Ba0oP7as9egd5XqR7w-1 From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Erico Nunes Subject: [PATCH] tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support Date: Tue, 14 Nov 2023 21:34:56 +0100 Message-ID: <20231114203456.319093-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1699994148914100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Antonio Caggiano --- 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 featur= es 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() --=20 2.41.0