From nobody Thu Nov 14 17:58:43 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1708331897; cv=none; d=zohomail.com; s=zohoarc; b=DjTarqklB+4fWpdQVearmSEKYfrssmMnIvtDzm7AEvp1qsyqF/g9bxwyQnW+91BBFwnE2OXxYtHhjBjTiONviTzkAeiq217fJQpXkDGE/YgU9r0nV2ct2enT59Q7OzBmioaj5RUq8kS0rFIt4lQhx7nz9Q0/dpsOx5ZLgxsg9XQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708331897; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZtUlfVC/CoXaXLT7OI7+r07dsTnTE47z6bChDQn+KEY=; b=eNY6btoElCEmGS12h09/U/uG3rThls4tboz+SEbZE94H0kTHCkzCpa2uugTkxGglW4vKxSiNrCJvTLxOJXrKMbr2JzTWpswm8Mdk7n2FRBm4xDV+J8aOiaY/nfDrsDlqb2n+d26H6/VOoenbR/o8RUbWftUVq+3zg5lANwZJ5XM= 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 1708331897211261.2497355385186; Mon, 19 Feb 2024 00:38:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbz2X-00008v-DG; Mon, 19 Feb 2024 03:30:17 -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 1rbz2V-0008W1-AV; Mon, 19 Feb 2024 03:30:15 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbz2Q-000269-2j; Mon, 19 Feb 2024 03:30:14 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1d93edfa76dso21945685ad.1; Mon, 19 Feb 2024 00:30:09 -0800 (PST) Received: from wheely.local0.net ([1.146.38.93]) by smtp.gmail.com with ESMTPSA id mo7-20020a1709030a8700b001db5ecd115bsm3838348plb.276.2024.02.19.00.30.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 00:30:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708331408; x=1708936208; 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=ZtUlfVC/CoXaXLT7OI7+r07dsTnTE47z6bChDQn+KEY=; b=NVUq+TAj5rl5rlRviYbMcdbr+WnlDQ1NyKbCX80tw/wcQ4ZO6njrmkoeatTLatSzU6 ttP5GwBoDQygxNY5biauCSLQ5uZ869SPw7qpw0SJJZdbphDCAPZqm012v0cW7inIJmh5 QSstbNuOpCGHzSQ+2u8mvXKuf9L1Icaxe6Nyx1qvr+ydSE+YbrmE0FmE+bOnWXbUrkhe oAyIEcLLPa3yKcD+gyOFCwCKph4OLjVz2JA10fPqOFp6vlT/ORJm7hhtxXCVqc5L6b/e +VPZnTY5FjbBgefJfHI0dh2wh/hDIpyPgSX5FZ9gnb/gWpWsw0IfR4XhoC0XJ2ovpJK7 jh+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708331408; x=1708936208; 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=ZtUlfVC/CoXaXLT7OI7+r07dsTnTE47z6bChDQn+KEY=; b=n7wvTK/HxFaK2RqZF+Tfbs2aDUTj4hkvRi8QIoofPHsifAxabqP/gZJvXhrHey5M7A MHY7apX9b835wP4nURgDie1fccrbhutAGgqPxg2pSK7kDnf9YtOeicXi+fyxirPnAObL fUOxp7DoIi3uMoG5RirwcqSE6IJRHj+BZWDnbXJPi5LhLyZUN79fok2FF2lgdCTuyWZQ 0Vuf7L+LbFjVjfbtlTQSJBvIyXAGUxyUyPOPcUiyuMCycmcqyszsqtou6xzLbco8ng92 RrT1WAzv0aj/2xJ39oZbigfIfoGzLeTv4YPtb0t+uHxmuuDHRnHyYH6GBm7BjtoChNbX Mmng== X-Forwarded-Encrypted: i=1; AJvYcCW2xH9+TLEZ2UZeOwmiLXO9IwJjEEvMQJhW1QmXJSL4kuJoTCzkdAZM+O1Yureh4tGSOBYljp/vdLkLwvkyqVFSpygs X-Gm-Message-State: AOJu0YxR614feK5g0+rMv8XcdZGg8rBriA4rOeAQgxcSB8gVvQeZKEq/ BmDF7CKa82tGqoy0CEdaoQnYqhBDkWI71xMD2uA2WZLdzcOrMp57wx4LFnrw X-Google-Smtp-Source: AGHT+IHR1yiDSA0p5vDPtD6Q2XzpweQh47uaFuKVjeqqQq84GKKUu6Jd9quJHdUolelheoJk+QI8Zg== X-Received: by 2002:a17:902:e804:b0:1dc:28:185a with SMTP id u4-20020a170902e80400b001dc0028185amr1102972plg.59.1708331408091; Mon, 19 Feb 2024 00:30:08 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Harsh Prateek Bora Subject: [PULL 03/49] tests/avocado: mark boot_linux.py long runtime instead of flaky Date: Mon, 19 Feb 2024 18:28:52 +1000 Message-ID: <20240219082938.238302-4-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240219082938.238302-1-npiggin@gmail.com> References: <20240219082938.238302-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::636; envelope-from=npiggin@gmail.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 @gmail.com) X-ZM-MESSAGEID: 1708331898386100011 The ppc64 and s390x tests were first marked skipIf GITLAB_CI by commit c0c8687ef0f ("tests/avocado: disable BootLinuxPPC64 test in CI"), and commit 0f26d94ec9e ("tests/acceptance: skip s390x_ccw_vrtio_tcg on GitLab") due to being very heavy-weight for gitlab CI. Commit 9b45cc99318 ("docs/devel: rationalise unstable gitlab tests under FLAKY_TESTS") changed this to being flaky but it isn't really, it just had a long runtime. So take the SPEED=3Dslow variable from qtests and introduce it to avocado, and make these tests require it. Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Nicholas Piggin --- docs/devel/testing.rst | 11 +++++++++++ tests/avocado/boot_linux.py | 8 ++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index bd132306c1..5cdc23b90f 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1346,6 +1346,17 @@ the environment. The definition of *large* is a bit arbitrary here, but it usually means an asset which occupies at least 1GB of size on disk when uncompressed. =20 +SPEED +^^^^^ +Tests which have a long runtime will not be run unless ``SPEED=3Dslow`` is +exported on the environment. + +The definition of *long* is a bit arbitrary here, and it depends on the +usefulness of the test too. A unique test is worth spending more time on, +small variations on existing tests perhaps less so. As a rough guide, +a test or set of similar tests which take more than 100 seconds to +complete. + AVOCADO_ALLOW_UNTRUSTED_CODE ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ There are tests which will boot a kernel image or firmware that can be diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 7c4769904e..de4c8805f7 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -93,13 +93,11 @@ class BootLinuxPPC64(LinuxTest): =20 timeout =3D 360 =20 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on G= itLab') - + @skipUnless(os.getenv('SPEED') =3D=3D 'slow', 'runtime limited') def test_pseries_tcg(self): """ :avocado: tags=3Dmachine:pseries :avocado: tags=3Daccel:tcg - :avocado: tags=3Dflaky """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") @@ -113,13 +111,11 @@ class BootLinuxS390X(LinuxTest): =20 timeout =3D 240 =20 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on G= itLab') - + @skipUnless(os.getenv('SPEED') =3D=3D 'slow', 'runtime limited') def test_s390_ccw_virtio_tcg(self): """ :avocado: tags=3Dmachine:s390-ccw-virtio :avocado: tags=3Daccel:tcg - :avocado: tags=3Dflaky """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") --=20 2.42.0