From nobody Fri May 9 14:54:37 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=1734520292; cv=none;
d=zohomail.com; s=zohoarc;
b=iBuooDqktUxjBz+rlRlKjQ/DchIesxAOZRM/fvfIuJ/XnS3CkWa9ky7a1wYPJZUiRp+s1dnaoeb2L/bcx6V0PwD7CMDNj+Qrqam0CLKM3yq8lNiXFTWzMd4FtDg+o7XDtOG6DHkdNejO+1bONl5m8M6uEfUtDrq21JR+dIHNybE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734520292;
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=6WSHIx4So9SK9q9MV6py97knKTrG71pY+baBobNgQe4=;
b=Hj2mbPdyF8CV3pBxisJ2bA7BDmZIG/lshi+W1oLAZInAakTZ6D2Cm6c/LFKh+FsCaY2jUqJQy6d1RWP3hA4JyjQ2xBhDkbjN2BLJLau1jdE1p0QtdzxoTXmAMKEWB7ajhfmStsRY2CDm55TfxYECyvKh7MsDl4lh+SJfvd/S3uQ=
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=<thuth@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734520292464870.3571819011689;
Wed, 18 Dec 2024 03:11:32 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tNrwr-0006UZ-OI; Wed, 18 Dec 2024 06:10:37 -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 <thuth@redhat.com>) id 1tNrwm-0006Td-IK
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 06:10:32 -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 <thuth@redhat.com>) id 1tNrwj-0005GA-M2
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 06:10:32 -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-326-BGVdktniNDOUfa1vJMbfvw-1; Wed,
18 Dec 2024 06:10:25 -0500
Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40])
(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 2DA781955D42
for <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 11:10:24 +0000 (UTC)
Received: from thuth-p1g4.redhat.com (unknown [10.39.192.114])
by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id C9A8A19560AD; Wed, 18 Dec 2024 11:10:22 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1734520226;
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=6WSHIx4So9SK9q9MV6py97knKTrG71pY+baBobNgQe4=;
b=hYbfDwh3XEqFz2j7bWRx2XgVMvEojME7WJjzU9GD6TPksQzOVT5FMOpEUoW9MqlOHrBLQM
+JBoqBB/1avNHCvUK6xKdyKVbosgvMSWBItxSaO6AQR0XLWQkE6813fDXxNknfKHnamFQd
Vag/g4pfYZ6DpZ1DIoIYOQosu3ybLFk=
X-MC-Unique: BGVdktniNDOUfa1vJMbfvw-1
X-Mimecast-MFC-AGG-ID: BGVdktniNDOUfa1vJMbfvw
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL 09/38] tests/functional: drop 'has_cmd' and 'has_cmds' helpers
Date: Wed, 18 Dec 2024 12:09:29 +0100
Message-ID: <20241218110958.226932-10-thuth@redhat.com>
In-Reply-To: <20241218110958.226932-1-thuth@redhat.com>
References: <20241218110958.226932-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.40
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: -31
X-Spam_score: -3.2
X-Spam_bar: ---
X-Spam_report: (-3.2 / 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_H2=-1.116,
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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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: 1734520294514116600
From: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
The 'which' helper is simpler, not depending on the external 'which'
binary, and is sufficient for test needs.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Message-ID: <20241217155953.3950506-10-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/qemu_test/__init__.py | 2 +-
tests/functional/qemu_test/cmd.py | 54 ++----------------------
tests/functional/qemu_test/tuxruntest.py | 10 ++---
3 files changed, 9 insertions(+), 57 deletions(-)
diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu=
_test/__init__.py
index 7dee3522f2..fe6cbe3a8a 100644
--- a/tests/functional/qemu_test/__init__.py
+++ b/tests/functional/qemu_test/__init__.py
@@ -8,7 +8,7 @@
=20
from .asset import Asset
from .config import BUILD_DIR
-from .cmd import has_cmd, has_cmds, run_cmd, is_readable_executable_file, \
+from .cmd import run_cmd, is_readable_executable_file, \
interrupt_interactive_console_until_pattern, wait_for_console_pattern,=
\
exec_command, exec_command_and_wait_for_pattern, get_qemu_img, which
from .testcase import QemuBaseTest, QemuUserTest, QemuSystemTest
diff --git a/tests/functional/qemu_test/cmd.py b/tests/functional/qemu_test=
/cmd.py
index 600e0509db..bebcd46dcf 100644
--- a/tests/functional/qemu_test/cmd.py
+++ b/tests/functional/qemu_test/cmd.py
@@ -29,52 +29,6 @@ def which(tool):
return p
return None
=20
-def has_cmd(name, args=3DNone):
- """
- This function is for use in a @skipUnless decorator, e.g.:
-
- @skipUnless(*has_cmd('sudo -n', ('sudo', '-n', 'true')))
- def test_something_that_needs_sudo(self):
- ...
- """
-
- if args is None:
- args =3D ('which', name)
-
- try:
- _, stderr, exitcode =3D run_cmd(args)
- except Exception as e:
- exitcode =3D -1
- stderr =3D str(e)
-
- if exitcode !=3D 0:
- cmd_line =3D ' '.join(args)
- err =3D f'{name} required, but "{cmd_line}" failed: {stderr.strip(=
)}'
- return (False, err)
- else:
- return (True, '')
-
-def has_cmds(*cmds):
- """
- This function is for use in a @skipUnless decorator and
- allows checking for the availability of multiple commands, e.g.:
-
- @skipUnless(*has_cmds(('cmd1', ('cmd1', '--some-parameter')),
- 'cmd2', 'cmd3'))
- def test_something_that_needs_cmd1_and_cmd2(self):
- ...
- """
-
- for cmd in cmds:
- if isinstance(cmd, str):
- cmd =3D (cmd,)
-
- ok, errstr =3D has_cmd(*cmd)
- if not ok:
- return (False, errstr)
-
- return (True, '')
-
def run_cmd(args):
subp =3D subprocess.Popen(args,
stdout=3Dsubprocess.PIPE,
@@ -254,7 +208,7 @@ def get_qemu_img(test):
qemu_img =3D os.path.join(BUILD_DIR, 'qemu-img')
if os.path.exists(qemu_img):
return qemu_img
- (has_system_qemu_img, errmsg) =3D has_cmd('qemu-img')
- if has_system_qemu_img:
- return 'qemu-img'
- test.skipTest(errmsg)
+ qemu_img =3D which('qemu-img')
+ if qemu_img is not None:
+ return qemu_img
+ test.skipTest(f"qemu-img not found in {BUILD_DIR} or '$PATH'")
diff --git a/tests/functional/qemu_test/tuxruntest.py b/tests/functional/qe=
mu_test/tuxruntest.py
index d375f2713b..2e5c6d110c 100644
--- a/tests/functional/qemu_test/tuxruntest.py
+++ b/tests/functional/qemu_test/tuxruntest.py
@@ -15,7 +15,7 @@
from qemu_test import QemuSystemTest
from qemu_test import exec_command_and_wait_for_pattern
from qemu_test import wait_for_console_pattern
-from qemu_test import has_cmd, run_cmd, get_qemu_img
+from qemu_test import which, run_cmd, get_qemu_img
=20
class TuxRunBaselineTest(QemuSystemTest):
=20
@@ -38,10 +38,8 @@ def setUp(self):
super().setUp()
=20
# We need zstd for all the tuxrun tests
- (has_zstd, msg) =3D has_cmd('zstd')
- if has_zstd is False:
- self.skipTest(msg)
- self.zstd =3D 'zstd'
+ if which('zstd') is None:
+ self.skipTest("zstd not found in $PATH")
=20
# Pre-init TuxRun specific settings: Most machines work with
# reasonable defaults but we sometimes need to tweak the
@@ -78,7 +76,7 @@ def fetch_tuxrun_assets(self, kernel_asset, rootfs_asset,=
dtb_asset=3DNone):
=20
disk_image =3D self.workdir + "/rootfs.ext4"
=20
- run_cmd([self.zstd, "-f", "-d", disk_image_zst,
+ run_cmd(['zstd', "-f", "-d", disk_image_zst,
"-o", disk_image])
# zstd copies source archive permissions for the output
# file, so must make this writable for QEMU
--=20
2.47.1