join-ns: Fix join-ns zdtm test

join-ns zdtm test will skip ns and uns flavors, and
some socket related test, too. Because join-ns test will
try to join an existing network namespace.
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

test/zdtm.py

@@ -1265,11 +1265,6 @@ def run_tests(opts):
 		opts['parallel'] = None
 
 	if opts['join_ns']:
-		print "[WARNING] Option --join-ns will skip ns and uns flavors, and some socket related tests."
-		r = re.compile('^(?!.*sock).*$')
-		torun = filter(lambda x: r.match(x), torun)
-		opts['keep_going'] = True
-		run_all = True
 		subprocess.Popen(["ip", "netns", "add", "zdtm_netns"])
 
 	l = launcher(opts, len(torun))
@@ -1312,6 +1307,11 @@ def run_tests(opts):
 					l.skip(t, "criu root prio needed")
 					continue
 
+			if opts['join_ns']:
+				if test_flag(tdesc, 'samens'):
+					l.skip(t, "samens test in the same namespace")
+					continue
+
 			test_flavs = tdesc.get('flavor', 'h ns uns').split()
 			opts_flavs = (opts['flavor'] or 'h,ns,uns').split(',')
 			if opts_flavs != ['best']:

test/zdtm/static/packet_sock.desc

-{'flags': 'suid'}
+{'flags': 'suid samens'}

test/zdtm/static/socket-tcp-local.desc

-{'flavor': 'h ns uns', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h ns uns', 'opts': '--tcp-established', 'flags': 'nouser samens'}

test/zdtm/static/socket-tcp.desc

-{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser samens'}

test/zdtm/static/socket-tcp6.desc

-{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser samens'}

test/zdtm/static/socket-tcpbuf-local.desc

-{'flavor': 'h ns uns', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h ns uns', 'opts': '--tcp-established', 'flags': 'nouser samens'}

test/zdtm/static/socket-tcpbuf.desc

-{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser samens'}

test/zdtm/static/socket-tcpbuf6.desc

-{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser samens'}

test/zdtm/static/socket_udp.desc

+{'flags': 'samens'}

test/zdtm/static/socket_udplite.desc

+{'flags': 'samens'}

test/zdtm/transition/socket-tcp.desc

-{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser samens'}

test/zdtm/transition/socket-tcp6.desc

-{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser'}
+{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser samens'}