From nobody Sun Feb 8 21:28:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568712459; cv=none; d=zoho.com; s=zohoarc; b=b+XCyBru2GlHtOdQEOLTUL7lNZ0j+1Uo1FpJNAbXJojAMjTFCHzZg0eZ275qtMo2IcNmoTUpw19+Vc6SPEVAA12U6KG2eAIXiak2gTBI+nyodxcxYSl5x9PTqOoNpJXbNOvoN8acFYivU0toiLrHfjN1Qe7M0/uqxIPFqu9Yhss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568712459; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KfWvi6zbqfKAu4mt4sLdfj7ROEL9Cgx1pZL0Jk0VqQk=; b=M1sFNk+HrmO259dCr4L62cHD1D9jBtYnZnHfw3K88Qp74UTHaC60QQ+OCo20wQW5BCGrNwx6WcBCtWLHpLQ0mPtUQJaYZX1jKK2pomkw+TE1h4QzZ2vMQ0fyM6l1ZZyWsZkaM+ppWWYfUl0DnxvCyBspoxe5cFdZOodrw2AfK8s= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568712459704460.2626763950643; Tue, 17 Sep 2019 02:27:39 -0700 (PDT) Received: from localhost ([::1]:43172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA9lq-0000XJ-Hd for importer@patchew.org; Tue, 17 Sep 2019 05:27:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34479) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA9eu-0001jA-2x for qemu-devel@nongnu.org; Tue, 17 Sep 2019 05:20:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iA9es-0004aK-Sp for qemu-devel@nongnu.org; Tue, 17 Sep 2019 05:20:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43715) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iA9eq-0004Xu-BH; Tue, 17 Sep 2019 05:20:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A073F3680A; Tue, 17 Sep 2019 09:20:23 +0000 (UTC) Received: from localhost (ovpn-116-130.ams2.redhat.com [10.36.116.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0FACB5D6B2; Tue, 17 Sep 2019 09:20:22 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 17 Sep 2019 11:20:00 +0200 Message-Id: <20190917092004.999-4-mreitz@redhat.com> In-Reply-To: <20190917092004.999-1-mreitz@redhat.com> References: <20190917092004.999-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 17 Sep 2019 09:20:23 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 3/7] iotests: Use case_skip() in skip_if_unsupported() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz , Andrey Shinkevich , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" skip_if_unsupported() should use the stronger variant case_skip(), because this allows it to be used even with setUp() (in a meaningful way). In the process, make it explicit what we expect the first argument of the func_wrapper to be (namely something derived of QMPTestCase). Signed-off-by: Max Reitz Reviewed-by: Andrey Shinkevich Reviewed-by: John Snow --- tests/qemu-iotests/iotests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index e46f3b6aed..427c34697a 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -893,14 +893,14 @@ def skip_if_unsupported(required_formats=3D[], read_o= nly=3DFalse): '''Skip Test Decorator Runs the test if all the required formats are whitelisted''' def skip_test_decorator(func): - def func_wrapper(*args, **kwargs): + def func_wrapper(test_case: QMPTestCase, *args, **kwargs): usf_list =3D list(set(required_formats) - set(supported_formats(read_only))) if usf_list: - case_notrun('{}: formats {} are not whitelisted'.format( - args[0], usf_list)) + test_case.case_skip('{}: formats {} are not whitelisted'.f= ormat( + test_case, usf_list)) else: - return func(*args, **kwargs) + return func(test_case, *args, **kwargs) return func_wrapper return skip_test_decorator =20 --=20 2.21.0