[CRIU] [PATCH] zdtm: run more tests in userns

[Andrei Vagin]

From: Andrei Vagin <avagin at virtuozzo.com>

They pass in userns, so we can run them by default.

Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
---
 test/zdtm/static/cow00.desc               | 2 +-
 test/zdtm/static/cow01.desc               | 2 +-
 test/zdtm/static/mntns_link_ghost.desc    | 2 +-
 test/zdtm/static/mntns_remap.desc         | 2 +-
 test/zdtm/static/packet_sock_spkt.desc    | 2 +-
 test/zdtm/static/pty03.desc               | 2 +-
 test/zdtm/static/remap_dead_pid.desc      | 2 +-
 test/zdtm/static/remap_dead_pid_root.desc | 2 +-
 test/zdtm/static/seccomp_strict.desc      | 2 +-
 test/zdtm/static/unlink_regular00.desc    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/zdtm/static/cow00.desc b/test/zdtm/static/cow00.desc
index 654ae75..0ce5a2d 100644
--- a/test/zdtm/static/cow00.desc
+++ b/test/zdtm/static/cow00.desc
@@ -1,2 +1,2 @@
 # /proc/pid/pagemap doesn't show phys addr for unprivileged users
-{'flavor': 'ns h', 'flags': 'suid nolazy'}
+{'flavor': 'ns h uns', 'flags': 'suid nolazy'}
diff --git a/test/zdtm/static/cow01.desc b/test/zdtm/static/cow01.desc
index 24a8142..46470f5 100644
--- a/test/zdtm/static/cow01.desc
+++ b/test/zdtm/static/cow01.desc
@@ -1 +1 @@
-{'flavor': 'h ns', 'flags': 'suid nolazy'}
+{'flavor': 'h ns uns', 'flags': 'suid nolazy'}
diff --git a/test/zdtm/static/mntns_link_ghost.desc b/test/zdtm/static/mntns_link_ghost.desc
index 3fd8e03..a8849e0 100644
--- a/test/zdtm/static/mntns_link_ghost.desc
+++ b/test/zdtm/static/mntns_link_ghost.desc
@@ -1 +1 @@
-{'flavor': 'ns', 'flags': 'suid', 'feature': 'mnt_id'}
+{'flavor': 'ns uns', 'flags': 'suid', 'feature': 'mnt_id'}
diff --git a/test/zdtm/static/mntns_remap.desc b/test/zdtm/static/mntns_remap.desc
index 3fd8e03..a8849e0 100644
--- a/test/zdtm/static/mntns_remap.desc
+++ b/test/zdtm/static/mntns_remap.desc
@@ -1 +1 @@
-{'flavor': 'ns', 'flags': 'suid', 'feature': 'mnt_id'}
+{'flavor': 'ns uns', 'flags': 'suid', 'feature': 'mnt_id'}
diff --git a/test/zdtm/static/packet_sock_spkt.desc b/test/zdtm/static/packet_sock_spkt.desc
index daba642..5adab69 100644
--- a/test/zdtm/static/packet_sock_spkt.desc
+++ b/test/zdtm/static/packet_sock_spkt.desc
@@ -1 +1 @@
-{'flavor':'h', 'flags' : 'suid'}
+{'flavor':'h uns ns', 'flags' : 'suid'}
diff --git a/test/zdtm/static/pty03.desc b/test/zdtm/static/pty03.desc
index 63df42a..c504739 100644
--- a/test/zdtm/static/pty03.desc
+++ b/test/zdtm/static/pty03.desc
@@ -1 +1 @@
-{'flavor': 'h'}
+{'flavor': 'h uns'}
diff --git a/test/zdtm/static/remap_dead_pid.desc b/test/zdtm/static/remap_dead_pid.desc
index 5939706..6c4afe5 100644
--- a/test/zdtm/static/remap_dead_pid.desc
+++ b/test/zdtm/static/remap_dead_pid.desc
@@ -1 +1 @@
-{'flavor': 'ns'}
+{'flavor': 'ns uns'}
diff --git a/test/zdtm/static/remap_dead_pid_root.desc b/test/zdtm/static/remap_dead_pid_root.desc
index 5939706..6c4afe5 100644
--- a/test/zdtm/static/remap_dead_pid_root.desc
+++ b/test/zdtm/static/remap_dead_pid_root.desc
@@ -1 +1 @@
-{'flavor': 'ns'}
+{'flavor': 'ns uns'}
diff --git a/test/zdtm/static/seccomp_strict.desc b/test/zdtm/static/seccomp_strict.desc
index d73e109..9c58186 100644
--- a/test/zdtm/static/seccomp_strict.desc
+++ b/test/zdtm/static/seccomp_strict.desc
@@ -1 +1 @@
-{'flavor': 'h', 'flags': 'suid', 'feature': 'seccomp_suspend'}
+{'flags': 'suid', 'feature': 'seccomp_suspend'}
diff --git a/test/zdtm/static/unlink_regular00.desc b/test/zdtm/static/unlink_regular00.desc
index cd3aa9d..4e3f10a 100644
--- a/test/zdtm/static/unlink_regular00.desc
+++ b/test/zdtm/static/unlink_regular00.desc
@@ -1 +1 @@
-{'flavor': 'ns', 'flags': 'suid', 'opts': '--link-remap'}
+{'flavor': 'ns uns', 'flags': 'suid', 'opts': '--link-remap'}
-- 
2.7.4