[CRIU] [PATCH] zdtm: Nicer flavs removal

[Pavel Emelyanov]

Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 test/zdtm.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 41f4b85..082d201 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1274,22 +1274,10 @@ def run_tests(opts):
 			else:
 				run_flavs = set([test_flavs.pop()])
 			if not criu_cli.check("userns"):
-				try:
-					run_flavs.remove("uns")
-				except KeyError:
-					# don't worry if uns isn't in run_flavs
-					pass
-
+				run_flavs -= set(['uns'])
 			if opts['user']:
 				# FIXME -- probably uns will make sense
-				try:
-					run_flavs.remove("ns")
-				except KeyError:
-					pass
-				try:
-					run_flavs.remove("uns")
-				except KeyError:
-					pass
+				run_flavs -= set(['ns', 'uns'])
 
 			if run_flavs:
 				l.run_test(t, tdesc, run_flavs)
-- 
2.5.0