From nobody Tue Feb 10 10:55:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635842575; cv=none; d=zohomail.com; s=zohoarc; b=Es8rOPmocev3cN4kExUQSIWWIyl6As7HA1py46TXgMh/N2Js6l5ByyEnqEXOp/bYOabG4/RMx9YEXroXqHrDrRQvvrfF30p8MbI27v9YyL2MJO9TS/c7KJmLrCTdQohzumxTuHJwaKz0veLjJAzuAk2EC3AwzUlvaxO8+CCNaYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635842575; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/GJnQqcSBpzJ9FdoSQJa+0mjU+wATrzkdQ7FymVRsE4=; b=EGZ7ATygKhcfY0rDQImi+l4QDC9wN2VRK3TXvA94XHmEDpl5JxaSp9PwyFzQVFRIdhN6wq3dVaOVog5Tg6PpxySYOviTwORdhsRGHKAoqyd4KTx411r0QKwnPFrp4g5uYxApxePVU8HXWholBW57EGq5mcPFi40/1zcXCVSEQsg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1635842575844234.59153410376416; Tue, 2 Nov 2021 01:42:55 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id r8so19193249wra.7 for ; Tue, 02 Nov 2021 01:42:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id z11sm6429172wrt.58.2021.11.02.01.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 01:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/GJnQqcSBpzJ9FdoSQJa+0mjU+wATrzkdQ7FymVRsE4=; b=L18uFuCDg4ETIcBgozDpwg5ZT8qi3vA8z1r1wFSrnpdIbfilO5GAKPesC5yncSdAbO +QBuRtQRq978c4J5VU42IUE4MY0X8z0JvEB4Y+P7LLRylMY/xJCYKNXmXzxrEHRHDb3X uXBPYUyxNwBBDVZcH1wjyZGzCPveStyZvf5FOQWUp3gsvxmELn42GDjHT9NdOBsz/1eK Ntq7inacRdBsH94LhXWh63kpHLJAY/E8u/f5UpmArP3DX1gOhFeIt6fjHYiYTrIAOalc FQLuiWnZPP+y/95M0OPWBwQa1XqXvBWS6BDCcXdKQ8FaGGPzR0+2J3yAzwyz3XQZ1Ne0 /9LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/GJnQqcSBpzJ9FdoSQJa+0mjU+wATrzkdQ7FymVRsE4=; b=draYha5gFvxv7tEl0CKwKr9c17aqDG3ANGE1LcS9tuMbWts0QRWRPgsbHxL/eUcO76 vVM2hUlK9ppe1JqJ5ugfHAsBD3O8bExh7+Ig8y5D162sB1JMVtzeqcJtMu+rTuF3AdVg jPIovObiqSy3Ff+T4bQBXLqqa7DARuZzAvmiPdOYo83vkgYsWnBQPERZuJyfBnYUTd1Q IevvNKN0fLtE8EujLg+wKixt8SafJp9PWYh1oedcnrdpddhp6dnR8cKbO21L2CHjTnfZ I8UHSMcydsd8VeTGvmnhJyFSsJ+yJ01vfqeMuhDxrvDYwD5K44aGCQHeL0Zg4W9Il7RR VHbw== X-Gm-Message-State: AOAM530cOU7bd7GotUTJH22qLUT+qRTS3WkmNyZFolNRIa/syqwvfF5k OzVHvd5XNB6RSNxCObceR3Q= X-Google-Smtp-Source: ABdhPJx2bwdYjsWaDJ/lQOKax5vJidZarDIll5wfw9aDr9Nqv9svYQSd7Rwf+wsLJPYU4vvjY6HrmQ== X-Received: by 2002:a5d:6d07:: with SMTP id e7mr10471312wrq.311.1635842574127; Tue, 02 Nov 2021 01:42:54 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Willian Rampazzo , Warner Losh , Cleber Rosa , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 4/6] tests/acceptance: Share useful helpers from virtiofs_submounts test Date: Tue, 2 Nov 2021 09:42:30 +0100 Message-Id: <20211102084232.2965062-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102084232.2965062-1-f4bug@amsat.org> References: <20211102084232.2965062-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635842577079100001 Move the useful has_cmd()/has_cmds() helpers from the virtiofs test to the avocado_qemu public class. Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/avocado_qemu/__init__.py | 57 ++++++++++++++++++++++ tests/acceptance/virtiofs_submounts.py | 59 +---------------------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 85bb3519969..0d0478374c3 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -11,6 +11,7 @@ import logging import os import shutil +import subprocess import sys import tempfile import time @@ -41,6 +42,62 @@ tcg_available) =20 =20 +def has_cmd(name, args=3DNone): + """ + This function is for use in a @avocado.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 @avocado.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, + stderr=3Dsubprocess.PIPE, + universal_newlines=3DTrue) + stdout, stderr =3D subp.communicate() + ret =3D subp.returncode + + return (stdout, stderr, ret) + def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) =20 diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virt= iofs_submounts.py index 21ad7d792e7..e6dc32ffd4e 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -6,67 +6,12 @@ =20 from avocado import skipUnless from avocado_qemu import LinuxTest, BUILD_DIR +from avocado_qemu import has_cmds +from avocado_qemu import run_cmd from avocado_qemu import wait_for_console_pattern from avocado.utils import ssh =20 =20 -def run_cmd(args): - subp =3D subprocess.Popen(args, - stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.PIPE, - universal_newlines=3DTrue) - stdout, stderr =3D subp.communicate() - ret =3D subp.returncode - - return (stdout, stderr, ret) - -def has_cmd(name, args=3DNone): - """ - This function is for use in a @avocado.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 @avocado.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, '') - - class VirtiofsSubmountsTest(LinuxTest): """ :avocado: tags=3Darch:x86_64 --=20 2.31.1