From nobody Fri May 17 03:39:46 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=1690188561; cv=none; d=zohomail.com; s=zohoarc; b=C1waQPquskyphllSLGvSOazXhv8xwVrDE5x2g3uqX45QERPiDl21In2oEW9NxElcygqOEY2wknrHexB5r+fmeUgeNzLQP8QQ50vaPlhEsflOLAxkanxwAx50frtcDx3B3ca8YP3tk4qL6jCVLYi65l0UyIlTGf9IwoSjxnDFrAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690188561; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=YtCEV1ZGEbdO9eJJiu78haDfPpIJzaIPMnmn+6JqFx8=; b=M0C6vqXg4pC1AqVE+ZFM7NYz4C7DZVRqrDhRehv2KIO/6hiPo5kluuNN2cgx1taht1CuSRycHhorjxoaZlaQYP+YMvNu/eiJ028tzHf26oQwQGEOTGxQiahsx6pv0Q2TCQWPtLNFOstLHWyxR4k6InX+JxyOH29+b9aPHyOxofw= 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 16901885619821019.9158844005938; Mon, 24 Jul 2023 01:49:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNrFl-0007VU-DK; Mon, 24 Jul 2023 04:49:18 -0400 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 1qNrFZ-0007MP-80 for qemu-devel@nongnu.org; Mon, 24 Jul 2023 04:49:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qNrFU-0007ql-P9 for qemu-devel@nongnu.org; Mon, 24 Jul 2023 04:49:03 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-678-9GFkmFOMOAm8PCAYbNLrlg-1; Mon, 24 Jul 2023 04:48:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C903830EFC; Mon, 24 Jul 2023 08:48:55 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id B63B340C206F; Mon, 24 Jul 2023 08:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690188539; 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=YtCEV1ZGEbdO9eJJiu78haDfPpIJzaIPMnmn+6JqFx8=; b=S7nYb4shsYzx8kvcNvx4Pjy9KwX6bXY9e3o99R2MYWhBO6usPm/Vt+e5mWlKyD88u4Ig+A H/noKwught8hfFd+7zNFG8Alyl+nFpV3J9zNAA/YDPTFWwTnnCaiCNdlAgIpKOZ1RAhCY8 TdH02pVo1KOVKqxIq/MF8ZKUR6q/2R0= X-MC-Unique: 9GFkmFOMOAm8PCAYbNLrlg-1 From: Thomas Huth To: qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, Christian Borntraeger , Eric Farman , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH] tests/avocado/machine_s390_ccw_virtio: Skip the flaky virtio-gpu test by default Date: Mon, 24 Jul 2023 10:48:51 +0200 Message-Id: <20230724084851.24251-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.133.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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: 1690188563814100003 Content-Type: text/plain; charset="utf-8" The virtio-gpu test is known to be flaky - that's why we also did not enable the test_s390x_fedora in the gitlab CI. However, a flaky test can also be annoying when testing locally, so let's rather skip this subtest by default and start running the test_s390x_fedora test in the gitlab CI again (since the other things that are tested here are quite valuable). Signed-off-by: Thomas Huth Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/avocado/machine_s390_ccw_virtio.py | 51 +++++++++++++----------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machi= ne_s390_ccw_virtio.py index 78152f2ad1..e7a2a20ba6 100644 --- a/tests/avocado/machine_s390_ccw_virtio.py +++ b/tests/avocado/machine_s390_ccw_virtio.py @@ -159,7 +159,6 @@ def test_s390x_devices(self): 'MemTotal: 115640 kB') =20 =20 - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_s390x_fedora(self): =20 """ @@ -229,31 +228,35 @@ def test_s390x_fedora(self): # writing to the framebuffer. Since the PPM is uncompressed, we th= en # can simply read the written "magic bytes" back from the PPM file= to # check whether the framebuffer is working as expected. - self.log.info("Test screendump of virtio-gpu device") - exec_command_and_wait_for_pattern(self, + # Unfortunately, this test is flaky, so we don't run it by default + if os.getenv('QEMU_TEST_FLAKY_TESTS'): + self.log.info("Test screendump of virtio-gpu device") + exec_command_and_wait_for_pattern(self, 'while ! (dmesg | grep gpudrmfb) ; do sleep 1 ; do= ne', 'virtio_gpudrmfb frame buffer device') - exec_command_and_wait_for_pattern(self, - 'echo -e "\e[?25l" > /dev/tty0', ':/#') - exec_command_and_wait_for_pattern(self, 'for ((i=3D0;i<250;i++)); = do ' - 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox= .txt;' - 'done', - ':/#') - exec_command_and_wait_for_pattern(self, - 'dd if=3Dfox.txt of=3D/dev/fb0 bs=3D1000 oflag=3Dsync,nocache = ; rm fox.txt', - '12+0 records out') - with tempfile.NamedTemporaryFile(suffix=3D'.ppm', - prefix=3D'qemu-scrdump-') as ppmf= ile: - self.vm.command('screendump', filename=3Dppmfile.name) - ppmfile.seek(0) - line =3D ppmfile.readline() - self.assertEqual(line, b"P6\n") - line =3D ppmfile.readline() - self.assertEqual(line, b"1280 800\n") - line =3D ppmfile.readline() - self.assertEqual(line, b"255\n") - line =3D ppmfile.readline(256) - self.assertEqual(line, b"The quick fox jumps over a lazy dog\n= ") + exec_command_and_wait_for_pattern(self, + 'echo -e "\e[?25l" > /dev/tty0', ':/#') + exec_command_and_wait_for_pattern(self, 'for ((i=3D0;i<250;i++= )); do ' + 'echo " The qu ick fo x j ump s o ver a laz y d og" >>= fox.txt;' + 'done', + ':/#') + exec_command_and_wait_for_pattern(self, + 'dd if=3Dfox.txt of=3D/dev/fb0 bs=3D1000 oflag=3Dsync,noca= che ; rm fox.txt', + '12+0 records out') + with tempfile.NamedTemporaryFile(suffix=3D'.ppm', + prefix=3D'qemu-scrdump-') as = ppmfile: + self.vm.command('screendump', filename=3Dppmfile.name) + ppmfile.seek(0) + line =3D ppmfile.readline() + self.assertEqual(line, b"P6\n") + line =3D ppmfile.readline() + self.assertEqual(line, b"1280 800\n") + line =3D ppmfile.readline() + self.assertEqual(line, b"255\n") + line =3D ppmfile.readline(256) + self.assertEqual(line, b"The quick fox jumps over a lazy d= og\n") + else: + self.log.info("Skipped flaky screendump of virtio-gpu device t= est") =20 # Hot-plug a virtio-crypto device and see whether it gets accepted self.log.info("Test hot-plug virtio-crypto device") --=20 2.39.3