[CRIU] [PATCH] zdtm: Call criu.available() only for `run` action

Andrei Vagin avagin at virtuozzo.com
Wed Aug 29 15:09:12 MSK 2018


Applied, thanks!

On Mon, Aug 27, 2018 at 02:28:56PM +0100, Radostin Stoyanov wrote:
> 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 <module>
>     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 <rstoyanov1 at gmail.com>
> ---
>  test/zdtm.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/test/zdtm.py b/test/zdtm.py
> index 90c1ac5a..c2778752 100755
> --- a/test/zdtm.py
> +++ b/test/zdtm.py
> @@ -2239,7 +2239,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()
>  
> -- 
> 2.17.1
> 
> _______________________________________________
> CRIU mailing list
> CRIU at openvz.org
> https://lists.openvz.org/mailman/listinfo/criu


More information about the CRIU mailing list