From d40c702dd86fca4f7e06e6365b799c9dfa03eec5 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Mon, 27 Aug 2018 14:28:56 +0100 Subject: [PATCH] zdtm: Call criu.available() only for `run` action When zdtm.py is executed with `list` sub-command the 'criu_bin' option is not defined and criu.available() fails. $ python test/zdtm.py list Traceback (most recent call last): File "test/zdtm.py", line 2243, in criu.available() File "test/zdtm.py", line 1185, in available if not os.access(opts['criu_bin'], os.X_OK): KeyError: u'criu_bin' However, we don't need to check the existence of criu_bin unless we use the `run` action. Signed-off-by: Radostin Stoyanov Acked-by: Adrian Reber Signed-off-by: Andrei Vagin --- test/zdtm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/zdtm.py b/test/zdtm.py index 7b80f536d..23884166e 100755 --- a/test/zdtm.py +++ b/test/zdtm.py @@ -2213,7 +2213,8 @@ if opts.get('sat', False): if opts['debug']: sys.settrace(traceit) -criu.available() +if opts['action'] == 'run': + criu.available() for tst in test_classes.values(): tst.available()