From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 42B335A0289 for ; Tue, 27 Jun 2023 04:54:47 +0200 (CEST) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Qqq7K02NVz4wqj; Tue, 27 Jun 2023 12:54:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1687834477; bh=p532s1C87s03UF5VRXIhKy38A6NMDFl5zhxkpicK9tI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXzSC/CCb4Ai6a2gAnueKdroQUupUBmnbxtQgf97X4PAg2BitEJtvtqlC3prLpAXD RAg0lzhxzoV1jzv2vl2YYq1zWxZ7fj/9hRaRVnoL7gpbIVCOEVZSalZ+RfvIXPb2mx 4wzFiyNVhUvE/QBXgfWmAevFSEMHytO52u9XQ6WU= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 13/27] tasst: Add helpers for running background commands on sites Date: Tue, 27 Jun 2023 12:54:14 +1000 Message-ID: <20230627025429.2209702-14-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230627025429.2209702-1-david@gibson.dropbear.id.au> References: <20230627025429.2209702-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: LGLGN2UUSCM3DO76JJ3QPMEQXRQ34JPO X-Message-ID-Hash: LGLGN2UUSCM3DO76JJ3QPMEQXRQ34JPO X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: crosa@redhat.com, jarichte@redhat.com, David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: We provide a wrapper around the Avocado utils library SubProcess because we want to check for failure of background processes by default. Signed-off-by: David Gibson --- test/tasst/exesite.py | 73 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/test/tasst/exesite.py b/test/tasst/exesite.py index 9f037f77..e69db8ad 100644 --- a/test/tasst/exesite.py +++ b/test/tasst/exesite.py @@ -18,6 +18,35 @@ import avocado from avocado.utils.process import CmdError from avocado_classless.test import assert_eq, assert_raises, test_output +from tasst.typecheck import typecheck + + +class SiteProcess(contextlib.AbstractContextManager): + """ + A background process running on a Site + """ + + def __init__(self, site, cmd, subp, *, + ignore_status, context_timeout): + self.site = typecheck(site, Site) + self.cmd = typecheck(cmd, str) + self.subproc = typecheck(subp, avocado.utils.process.SubProcess) + self.ignore_status = typecheck(ignore_status, bool) + self.context_timeout = float(context_timeout) + + def __enter__(self): + self.subproc.start() + return self + + def __exit__(self, *exc_details): + result = self.subproc.run(timeout=self.context_timeout) + if not self.ignore_status and result.exit_status != 0: + siteinfo = f'[{self.site.name} site]' + raise avocado.utils.process.CmdError(self.cmd, result, siteinfo) + + def run(self, **kwargs): + return self.subproc.run(**kwargs) + class Site(contextlib.AbstractContextManager): """ @@ -47,6 +76,16 @@ class Site(contextlib.AbstractContextManager): cmd, kwargs = self.hostify(cmd, **kwargs) return avocado.utils.process.system(cmd, **kwargs) + def subprocess(self, cmd, **kwargs): + cmd, kwargs = self.hostify(cmd, **kwargs) + return avocado.utils.process.SubProcess(cmd, **kwargs) + + def bg(self, cmd, context_timeout=1.0, ignore_status=False, **kwargs): + subproc = self.subprocess(cmd, **kwargs) + return SiteProcess(self, cmd, subproc, + context_timeout=context_timeout, + ignore_status=ignore_status) + def require_cmds(self, *cmds): missing = [c for c in cmds if self.fg(f'type {c}', ignore_status=True) != 0] @@ -74,7 +113,39 @@ def test_site(sitefn): with s as site: site.fg('sleep infinity', timeout=0.1, ignore_status=True) - return test_output(test_true, test_false, test_echo, test_timeout)(sitefn) + def test_bg_true(s): + with s as site: + with site.bg('true'): + pass + + def test_bg_false(s): + with s as site: + def run_false(): + with site.bg('false'): + pass + assert_raises(CmdError, run_false) + + def test_bg_echo(s): + msg = 'Hello tasst' + with s as site: + with site.bg(f'echo {msg}') as proc: + res = proc.run() + assert_eq(res.stdout, msg.encode('utf-8') + b'\n') + + def test_bg_timeout(s): + with s as site: + with site.bg('sleep infinity', ignore_status=True) as proc: + proc.run(timeout=0.1) + + def test_bg_context_timeout(s): + with s as site: + with site.bg('sleep infinity', context_timeout=0.1, + ignore_status=True): + pass + + return test_output(test_true, test_false, test_echo, test_timeout, + test_bg_true, test_bg_false, test_bg_echo, + test_bg_timeout, test_bg_context_timeout)(sitefn) class RealHost(Site): -- 2.41.0