mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

zdtm: Add timeouts for test commands.

Browse Source 
Extend ability to limit time taken to all CRIU invocations.

Signed-off-by: Michał Mirosław <emmir@google.com>
This commit is contained in:
Michał Mirosław
2023-04-25 21:30:20 +02:00
committed by Andrei Vagin
parent e55e168e90
commit 0bd5abe4ed
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/zdtm.py
View File

@@ -399,6 +399,7 @@ class zdtm_test:
self.__name = name self.__name = name
self.__desc = desc self.__desc = desc
self.__freezer = None self.__freezer = None
self.__timeout = int(self.__desc.get('timeout') or 30)
self.__rootless = rootless self.__rootless = rootless
self.__make_action('cleanout') self.__make_action('cleanout')
self.__pid = 0 self.__pid = 0
@@ -408,7 +409,6 @@ class zdtm_test:
self._env = {'TMPDIR': os.environ.get('TMPDIR', '/tmp')} self._env = {'TMPDIR': os.environ.get('TMPDIR', '/tmp')}
self._deps = desc.get('deps', []) self._deps = desc.get('deps', [])
self.auto_reap = True self.auto_reap = True
self.__timeout = int(self.__desc.get('timeout') or 30)
def __make_action(self, act, env=None, root=None): def __make_action(self, act, env=None, root=None):
sys.stdout.flush() # Not to let make's messages appear before ours sys.stdout.flush() # Not to let make's messages appear before ours
@@ -430,7 +430,7 @@ class zdtm_test:
preexec_fn=self.__freezer and self.__freezer.attach or None) preexec_fn=self.__freezer and self.__freezer.attach or None)
if act == "pid": if act == "pid":
try_run_hook(self, ["--post-start"]) try_run_hook(self, ["--post-start"])
if s.wait(): if s.wait(timeout=self.__timeout):
raise test_fail_exc(str(s_args)) raise test_fail_exc(str(s_args))
if self.__freezer: if self.__freezer:
@@ -839,7 +839,7 @@ class groups_test(zdtm_test):
subprocess.check_call(s_args + [tname + '.cleanout']) subprocess.check_call(s_args + [tname + '.cleanout'])
s = subprocess.Popen(s_args + ['--dry-run', tname + '.pid'], s = subprocess.Popen(s_args + ['--dry-run', tname + '.pid'],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
out, _ = s.communicate() out, _ = s.communicate(timeout=self.__timeout)
cmd = out.decode().splitlines()[-1].strip() cmd = out.decode().splitlines()[-1].strip()
return 'cd /' + tdir + ' && ' + cmd return 'cd /' + tdir + ' && ' + cmd
@@ -883,7 +883,8 @@ class criu_cli:
fault=None, fault=None,
strace=[], strace=[],
preexec=None, preexec=None,
nowait=False): nowait=False,
timeout=60):
env = dict( env = dict(
os.environ, os.environ,
ASAN_OPTIONS="log_path=asan.log:disable_coredump=0:detect_leaks=0") ASAN_OPTIONS="log_path=asan.log:disable_coredump=0:detect_leaks=0")
@@ -899,7 +900,7 @@ class criu_cli:
preexec_fn=preexec) preexec_fn=preexec)
if nowait: if nowait:
return cr return cr
return cr.wait() return cr.wait(timeout=timeout)
class criu_rpc_process: class criu_rpc_process:
@@ -982,7 +983,8 @@ class criu_rpc:
fault=None, fault=None,
strace=[], strace=[],
preexec=None, preexec=None,
nowait=False): nowait=False,
timeout=None):
if fault: if fault:
raise test_fail_exc('RPC and FAULT not supported') raise test_fail_exc('RPC and FAULT not supported')
if strace: if strace: