Skip to content

Commit

Permalink
zdtm: check userns once
Browse files Browse the repository at this point in the history
All test logs are flooded with the "userns is supported" messages...

Signed-off-by: Andrei Vagin <[email protected]>
  • Loading branch information
avagin committed Sep 27, 2023
1 parent a056519 commit 8b5f3af
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/zdtm.py
Original file line number Diff line number Diff line change
Expand Up @@ -2404,6 +2404,7 @@ def run_tests(opts):
"Specify --criu-image-streamer-dir or modify PATH to provide an alternate location")
.format(streamer_dir))

usernsIsSupported = criu.check("userns")
launcher = Launcher(opts, len(torun))
try:
for t in torun:
Expand Down Expand Up @@ -2473,7 +2474,7 @@ def run_tests(opts):
run_flavs = set(test_flavs) & set(opts_flavs)
else:
run_flavs = set([test_flavs.pop()])
if not criu.check("userns"):
if not usernsIsSupported:
run_flavs -= set(['uns'])
if opts['user']:
# FIXME -- probably uns will make sense
Expand Down

0 comments on commit 8b5f3af

Please sign in to comment.