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 <david(a)gibson.dropbear.id.au>
---
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