From nobody Thu Jan 23 03:13:54 2025 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=1737553435; cv=none; d=zohomail.com; s=zohoarc; b=NUdDrdBWtj9U7Y2wciiOvUXQ1x1UMJvoQ0XC3b/oT0uamadaXS2Lnuvb0pqpmFNuIRfAWRprZE8tcsezft0m0s8HKaeea0/iM1F3PWqaAPSwhHtsHxboDoLgt1v0NBasjtjr8qhDBbc6/T9xVxlnaHiDIerOwogDS1ap8MxQqvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737553435; 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=ITQ+ZnZWx6LRgP5QFHDBCQ5MV2fgmkA/ek9gq0JaqMU=; b=KRsP33JoVGrrMtuhS2QNcaesxNIyrYHK9Lx/SjP7U42/hAsYzVXBgd8sv5psSQWTIlRu0NCeYulI9pPJaF2GjOI88xsZEbbbr221b/ADn5yojUpL6+7UObIEbw6eFKs2BVx3AL+tJjiwTVtnZil+Kwr/oCvG/MfrjPgf0h7muyY= 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 1737553435104554.8753364713672; Wed, 22 Jan 2025 05:43:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tab12-0005YN-UH; Wed, 22 Jan 2025 08:43:34 -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 1tab0w-0005Vw-To for qemu-devel@nongnu.org; Wed, 22 Jan 2025 08:43:27 -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 1tab0u-0007Ef-H7 for qemu-devel@nongnu.org; Wed, 22 Jan 2025 08:43:26 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-67-0nKwiO_wOh-PB0zG5Lw63Q-1; Wed, 22 Jan 2025 08:43:21 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B5995195605C; Wed, 22 Jan 2025 13:43:20 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.246]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5FF7E19560B7; Wed, 22 Jan 2025 13:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737553403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ITQ+ZnZWx6LRgP5QFHDBCQ5MV2fgmkA/ek9gq0JaqMU=; b=h/or9sBgE//7ZgJnbTWKbP9RKwJHxwfcq4q9gRNw6uHfb/vCdkF8IF66ZU9NyXYgGmCos+ OW0nNdUgkxmqxTSUUHKGWVuCF1QOj7nrGtsBHSSuVWLJuZHCV5Zm9DJbTPlBMX9Vf1BV8N f+i8IHv8K8GcbC0MT9yuX8Xae84q3To= X-MC-Unique: 0nKwiO_wOh-PB0zG5Lw63Q-1 X-Mimecast-MFC-AGG-ID: 0nKwiO_wOh-PB0zG5Lw63Q From: Thomas Huth To: qemu-devel@nongnu.org, "Daniel P . Berrange" Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/2] tests/functional/qemu_test/decorators: Fix bad check for imports Date: Wed, 22 Jan 2025 14:43:13 +0100 Message-ID: <20250122134315.1448794-2-thuth@redhat.com> In-Reply-To: <20250122134315.1448794-1-thuth@redhat.com> References: <20250122134315.1448794-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: 1737553437148019000 skipIfMissingImports should use importlib.import_module() for checking whether a module with the name stored in the "impname" variable is available or not, otherwise the code tries to import a module with the name "impname" instead. (This bug hasn't been noticed before since there is another issue with this decorator that will be fixed by the next patch) Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/functional/qemu_test/decorators.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qe= mu_test/decorators.py index df088bc090..08f58f6b40 100644 --- a/tests/functional/qemu_test/decorators.py +++ b/tests/functional/qemu_test/decorators.py @@ -2,6 +2,7 @@ # # Decorators useful in functional tests =20 +import importlib import os import platform from unittest import skipUnless @@ -97,7 +98,7 @@ def skipIfMissingImports(*args): def has_imports(importlist): for impname in importlist: try: - import impname + importlib.import_module(impname) except ImportError: return False return True --=20 2.48.1 From nobody Thu Jan 23 03:13:54 2025 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=1737553501; cv=none; d=zohomail.com; s=zohoarc; b=XATdrQxcOPAN9frb0mRIWXyy4kKW7UVXCg8BnMY5ZmHUtddiXC+lP/PT6E9whI3CDfw0UtA5GbqVdc9wezSfJc5E7As9SLRcB1opRlSCR0gOcKfReyHgwVhIvsI2K+g7ivoSHZ/9orN1Zf3IQ/wyIfxwNvmg7z17xk5CcHHPrEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737553501; 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=kRYbkOsQHjzoJ8RrBaCEllpb6evC3e+/csnUQvpTj3g=; b=axEeCgpJhgZSbkddiNnX3KjCF+qeD+jIqwGZ85WuDDN1NC+RO8pu6L+XRy99NeY5xCnzII1lyHtQ1DKDyhP46sEa2SUitXN8CY0XArxzEWepvKdrjPqCafYR+BdeBGDNc9bxfPEf8B6Dlm2ShkysvL93YIffbvRZNkLy33u78Ok= 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 1737553501585164.832405865787; Wed, 22 Jan 2025 05:45:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tab1I-0005a1-1J; Wed, 22 Jan 2025 08:43:48 -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 1tab14-0005Yx-Ov for qemu-devel@nongnu.org; Wed, 22 Jan 2025 08:43:35 -0500 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 1tab0y-0007FC-Kq for qemu-devel@nongnu.org; Wed, 22 Jan 2025 08:43:34 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-288-cF6o0ToRNAa8cltSNpGMmg-1; Wed, 22 Jan 2025 08:43:24 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 01FC419560BD; Wed, 22 Jan 2025 13:43:23 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.246]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C2F1195608A; Wed, 22 Jan 2025 13:43:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737553407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kRYbkOsQHjzoJ8RrBaCEllpb6evC3e+/csnUQvpTj3g=; b=JoaR/QQROORVPi3wf0MvK4T56VVLsKaLu4/vfxwpqO3UiJNgPQaobFJVLqp35FD/0l1J/T fEtd91NR47XFvu3QqnddU7kagk74iEPdrJd3/WZXeCPAzoROh81SqZU0nILE3hIK6fXJu2 CzCuA0BEQU+ortgWdT6lpslGREotwO0= X-MC-Unique: cF6o0ToRNAa8cltSNpGMmg-1 X-Mimecast-MFC-AGG-ID: cF6o0ToRNAa8cltSNpGMmg From: Thomas Huth To: qemu-devel@nongnu.org, "Daniel P . Berrange" Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] tests/functional: Fix broken decorators with lamda functions Date: Wed, 22 Jan 2025 14:43:14 +0100 Message-ID: <20250122134315.1448794-3-thuth@redhat.com> In-Reply-To: <20250122134315.1448794-1-thuth@redhat.com> References: <20250122134315.1448794-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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_H2=-0.043, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: 1737553504149019000 The decorators that use a lambda function are currently broken and do not properly skip the test if the condition is not met. Using "return skipUnless(lambda: ...)" does not work as expected. To fix it, rewrite the decorators without lambda, it's simpler that way anyway. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- tests/functional/qemu_test/decorators.py | 44 +++++++++++------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qe= mu_test/decorators.py index 08f58f6b40..3d9c02fd59 100644 --- a/tests/functional/qemu_test/decorators.py +++ b/tests/functional/qemu_test/decorators.py @@ -17,15 +17,14 @@ @skipIfMissingCommands("mkisofs", "losetup") ''' def skipIfMissingCommands(*args): - def has_cmds(cmdlist): - for cmd in cmdlist: - if not which(cmd): - return False - return True - - return skipUnless(lambda: has_cmds(args), - 'required command(s) "%s" not installed' % - ", ".join(args)) + has_cmds =3D True + for cmd in args: + if not which(cmd): + has_cmds =3D False + break + + return skipUnless(has_cmds, 'required command(s) "%s" not installed' % + ", ".join(args)) =20 ''' Decorator to skip execution of a test if the current @@ -36,9 +35,9 @@ def has_cmds(cmdlist): @skipIfNotMachine("x86_64", "aarch64") ''' def skipIfNotMachine(*args): - return skipUnless(lambda: platform.machine() in args, - 'not running on one of the required machine(s) "%s= "' % - ", ".join(args)) + return skipUnless(platform.machine() in args, + 'not running on one of the required machine(s) "%s"'= % + ", ".join(args)) =20 ''' Decorator to skip execution of flaky tests, unless @@ -95,14 +94,13 @@ def skipBigDataTest(): @skipIfMissingImports("numpy", "cv2") ''' def skipIfMissingImports(*args): - def has_imports(importlist): - for impname in importlist: - try: - importlib.import_module(impname) - except ImportError: - return False - return True - - return skipUnless(lambda: has_imports(args), - 'required import(s) "%s" not installed' % - ", ".join(args)) + has_imports =3D True + for impname in args: + try: + importlib.import_module(impname) + except ImportError: + has_imports =3D False + break + + return skipUnless(has_imports, 'required import(s) "%s" not installed'= % + ", ".join(args)) --=20 2.48.1