Commit 517c0988 authored by Pavel Emelyanov's avatar Pavel Emelyanov

zdtm.py: Mark nouser tests as such

Some tests require criu to be root, e.g. tcp tests of unlink-mmaps ones,
so mark those in desc files as such.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Looks-good-to-me: Andrew Vagin <avagin@virtuozzo.com>
parent b8d92bd4
......@@ -1145,9 +1145,13 @@ def run_tests(opts):
l.skip(t, "self")
continue
if opts['user'] and test_flag(tdesc, 'suid'):
l.skip(t, "suid test in user mode")
continue
if opts['user']:
if test_flag(tdesc, 'suid'):
l.skip(t, "suid test in user mode")
continue
if test_flag(tdesc, 'nouser'):
l.skip(t, "criu root prio needed")
continue
test_flavs = tdesc.get('flavor', 'h ns uns').split()
opts_flavs = (opts['flavor'] or 'h,ns,uns').split(',')
......
{'feature': 'aio_remap'}
{'feature': 'aio_remap', 'flags': 'nouser'}
{'flavor': 'h ns'}
{'flavor': 'h ns', 'flags': 'nouser'}
{'opts': '--link-remap'}
{'opts': '--link-remap', 'flags': 'nouser'}
{'flavor': 'h ns uns', 'opts': '--tcp-established'}
{'flavor': 'h ns uns', 'opts': '--tcp-established', 'flags': 'nouser'}
{'flavor': 'h', 'opts': '--tcp-established'}
{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
{'flavor': 'h', 'opts': '--tcp-established'}
{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
{'flavor': 'h ns uns', 'opts': '--tcp-established'}
{'flavor': 'h ns uns', 'opts': '--tcp-established', 'flags': 'nouser'}
{'flavor': 'h', 'opts': '--tcp-established'}
{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
{'flavor': 'h', 'opts': '--tcp-established'}
{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
{'opts': '--link-remap'}
{'opts': '--link-remap', 'flags': 'nouser'}
{'flavor': 'h', 'opts': '--tcp-established'}
{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
{'flavor': 'h', 'opts': '--tcp-established'}
{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment