[CRIU] [PATCH 4/4] zdtm: add mntns_rw_ro_rw to the test list

[Andrey Vagin]

From: Andrew Vagin <avagin at virtuozzo.com>

Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
---
 test/zdtm.sh                              | 1 +
 test/zdtm/live/static/mntns_rw_ro_rw.c    | 5 +++--
 test/zdtm/live/static/mntns_rw_ro_rw.desc | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index ff92302..7d556d4 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -229,6 +229,7 @@ generate_test_list()
 		ns/static/mntns_root_bind
 		ns/static/mntns_deleted
 		ns/static/inotify01
+		ns/static/mntns_rw_ro_rw
 	"
 
 	TEST_AIO="
diff --git a/test/zdtm/live/static/mntns_rw_ro_rw.c b/test/zdtm/live/static/mntns_rw_ro_rw.c
index 5aac87c..c7b1d6c 100644
--- a/test/zdtm/live/static/mntns_rw_ro_rw.c
+++ b/test/zdtm/live/static/mntns_rw_ro_rw.c
@@ -30,13 +30,14 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	if (access("/proc/sys/net/unix/max_dgram_qlen", W_OK)) {
+	if (access("/proc/sys/net/ipv4/ip_forward", W_OK)) {
 		fail("Unable to access /proc/sys/net/core/wmem_max");
 		return 1;
 	}
 
-	if (access("/proc/sys/kernel/pid_max", W_OK) != -1 || errno != EROFS) {
+	if (access("/proc/sys/kernel/ns_last_pid", W_OK) != -1 || errno != EROFS) {
 		fail("Unable to access /proc/sys/kernel/pid_max");
+		sleep(1000);
 		return 1;
 	}
 
diff --git a/test/zdtm/live/static/mntns_rw_ro_rw.desc b/test/zdtm/live/static/mntns_rw_ro_rw.desc
index 95c58b4..7657ba4 100644
--- a/test/zdtm/live/static/mntns_rw_ro_rw.desc
+++ b/test/zdtm/live/static/mntns_rw_ro_rw.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor': 'ns uns', 'flags': 'suid'}
-- 
2.4.3