[CRIU] [PATCH] zdtm.py: skip the uns flavor if userns isn't suppported

Andrey Vagin avagin at openvz.org
Sun Dec 6 21:17:46 PST 2015


From: Andrew Vagin <avagin at virtuozzo.com>

Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
---
 test/zdtm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/zdtm.py b/test/zdtm.py
index 7cf113c..01fa4a9 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -916,6 +916,9 @@ def run_tests(opts):
 
 			test_flavs = tdesc.get('flavor', 'h ns uns').split()
 			opts_flavs = (opts['flavor'] or 'h,ns,uns').split(',')
+			if not criu_cli.check("userns"):
+				opts_flavs.remove("uns")
+
 			run_flavs = set(test_flavs) & set(opts_flavs)
 
 			if run_flavs:
-- 
2.4.3



More information about the CRIU mailing list