From nobody Tue Feb 10 03:38:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1636122879; cv=none; d=zohomail.com; s=zohoarc; b=bk17Gbk2v7Yk9xkCbBPOEH28VBGQB/RXvRu31E5ED/Jy6iedOBKlGv45trbz42XBECQODrXgBdaTRjGgQWuTkob4ngNbMw0O8LKDINCIO3w0KamICyAS0/PN1DiaBJ5DrQQKyr+rrgWg7/n3JdH5Lk3TYKntuBYvhvdj3BS+p74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636122879; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lc2f1q4l/nL1bJkK+RlDBtmqxziFnRAo/1XneAHzrMw=; b=YF5kQLEYOl54mxlCvewwMLr1E9LhJdQ6XpiUlwmeBkwPB0nmPQHBdb969t4suhXR5ajmGGRu6CN4KmkTAaNfzU+DN4t7jdembwMhU7tXDzB6hE3vzJCKNw580Yi+9RYCCD91PlLXMLYyFI2b68dxtAnLTxqayZG7OEu8pRpxBRg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1636122879928844.3646293402321; Fri, 5 Nov 2021 07:34:39 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id u1so14031690wru.13 for ; Fri, 05 Nov 2021 07:34:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id r15sm8468177wru.9.2021.11.05.07.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 07:34:37 -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=lc2f1q4l/nL1bJkK+RlDBtmqxziFnRAo/1XneAHzrMw=; b=fe9+h2vjuCBdfw5II2Co1byAUwOAyZPXhihwbfPoHJxy5HcH7+Ajo0UMkh/ZjuIWhA r4tfiI4yRbdzUpvVJ2KSx8gyXLFbqF6cU5zCiv33Lp5SprJa6yZfISR6kMndyy2h58nc ICx2/tl8qZLAKdbsKyxbqcj2UWBaQCxV6rdI4nixRXXb9BhH3Pz9rBY16Cnz+QVVTXdU s9+owyf4bhu8550eEjwcam7pbY5mYBtwZj4ADWGkkkw2abRKL+lVdQ+H/ByT5L8o4i4+ 54HO9qYhse2aTW5PUKIkFSRvJ/7La+JUAp8C+6+4HCckzlFsUHbIEFXxAGEVc8DiSwes Qbcw== 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=lc2f1q4l/nL1bJkK+RlDBtmqxziFnRAo/1XneAHzrMw=; b=meaJDA0hvvemqQ89N9GLBDMAQwwarlnIxcXFFY0FElB0AC/+Tz1VjkMbnBIfJvC8mU bzWedSgHx4EEeBNGM2zHWtAV79TTaVD+MNwwZpw5LKecxFrKj4/Yo4yFibXDl7YOzscX RZuWuRTboUyMiwZs4Lg6vxVeb+ISWNmf6yuFPAoDpfoUOladmHwvtvWEQdFiNiR64u2v BT0eGoCJx9Cv0T2PuDvtkxsZ/1clDcZFrWwBrv1gI+1XLQrsonZdGxWHs12Kv0aZ4pZr 9Kdi1psEmi8hrovgC5xvDTAF/otYoiVq/wf2+z7uxEbD8msxdeLWzv9LHoldlIUe1Kzg 6iMA== X-Gm-Message-State: AOAM533uU36dxjE/5hoo7LzHXVZo4MUMWmhTvSFgP52U5pB68eNc3ulc aU3IdgPHKQlv5NiCuKrzgys= X-Google-Smtp-Source: ABdhPJyiyIgxOt7SCBY4Xj8FvSdFeIe+ptpD6jbsZ/7xFkwif5Oe6lTKOvD+X6y6XK/eghOXp+0v3Q== X-Received: by 2002:a5d:6501:: with SMTP id x1mr46076836wru.390.1636122878204; Fri, 05 Nov 2021 07:34:38 -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: Cleber Rosa , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 4/6] tests/acceptance: Share useful helpers from virtiofs_submounts test Date: Fri, 5 Nov 2021 15:34:14 +0100 Message-Id: <20211105143416.148332-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211105143416.148332-1-f4bug@amsat.org> References: <20211105143416.148332-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: 1636122880601100002 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 Message-Id: <20211102084232.2965062-5-f4bug@amsat.org> --- tests/avocado/avocado_qemu/__init__.py | 57 +++++++++++++++++++++++++ tests/avocado/virtiofs_submounts.py | 59 +------------------------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index e46b3ecb89e..1efc22dabfa 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/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/avocado/virtiofs_submounts.py b/tests/avocado/virtiofs_s= ubmounts.py index 21ad7d792e7..e6dc32ffd4e 100644 --- a/tests/avocado/virtiofs_submounts.py +++ b/tests/avocado/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