[CRIU] [PATCH 2/2] zdtm: replace noauto on crfail where it's possible

[Andrey Vagin]

From: Andrew Vagin <avagin at virtuozzo.com>

Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
---
 test/zdtm/static/cow00.desc             | 3 ++-
 test/zdtm/static/inotify02.desc         | 2 +-
 test/zdtm/static/overmount_dev.desc     | 2 +-
 test/zdtm/static/overmount_fifo.desc    | 2 +-
 test/zdtm/static/overmount_file.desc    | 2 +-
 test/zdtm/static/overmount_sock.desc    | 2 +-
 test/zdtm/static/pty02.desc             | 1 -
 test/zdtm/static/socket-closed-tcp.desc | 2 +-
 test/zdtm/static/socket_aio.desc        | 2 +-
 test/zdtm/static/tty00.desc             | 1 -
 test/zdtm/static/unhashed_proc.desc     | 2 +-
 test/zdtm/static/unlink_largefile.desc  | 2 +-
 test/zdtm/static/unlink_regular00.desc  | 2 +-
 test/zdtm/transition/epoll.desc         | 1 -
 test/zdtm/transition/fifo_loop.desc     | 1 -
 test/zdtm/transition/file_aio.desc      | 1 -
 test/zdtm/transition/netlink00.desc     | 2 +-
 test/zdtm/transition/socket_loop00.desc | 1 -
 test/zdtm/transition/unix_sock.desc     | 1 -
 19 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 test/zdtm/static/pty02.desc
 delete mode 100644 test/zdtm/static/tty00.desc
 delete mode 100644 test/zdtm/transition/epoll.desc
 delete mode 100644 test/zdtm/transition/fifo_loop.desc
 delete mode 100644 test/zdtm/transition/file_aio.desc
 delete mode 100644 test/zdtm/transition/socket_loop00.desc
 delete mode 100644 test/zdtm/transition/unix_sock.desc

diff --git a/test/zdtm/static/cow00.desc b/test/zdtm/static/cow00.desc
index 95c58b4..c303c11 100644
--- a/test/zdtm/static/cow00.desc
+++ b/test/zdtm/static/cow00.desc
@@ -1 +1,2 @@
-{'flags': 'noauto'}
+# /proc/pid/pagemap doesn't show phys addr for unprivileged users
+{'flavor': 'ns h', 'flags': 'suid'}
diff --git a/test/zdtm/static/inotify02.desc b/test/zdtm/static/inotify02.desc
index 95c58b4..92b2cf5 100644
--- a/test/zdtm/static/inotify02.desc
+++ b/test/zdtm/static/inotify02.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags' : (lambda a: int(a[0]) * 100 + int(a[1]))(os.uname()[2].split('.')) < 400 and "noauto" or ""}
diff --git a/test/zdtm/static/overmount_dev.desc b/test/zdtm/static/overmount_dev.desc
index 95c58b4..c739fc9 100644
--- a/test/zdtm/static/overmount_dev.desc
+++ b/test/zdtm/static/overmount_dev.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : "ns", 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/overmount_fifo.desc b/test/zdtm/static/overmount_fifo.desc
index 95c58b4..1ba68c3 100644
--- a/test/zdtm/static/overmount_fifo.desc
+++ b/test/zdtm/static/overmount_fifo.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : 'ns uns', 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/overmount_file.desc b/test/zdtm/static/overmount_file.desc
index 95c58b4..1ba68c3 100644
--- a/test/zdtm/static/overmount_file.desc
+++ b/test/zdtm/static/overmount_file.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : 'ns uns', 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/overmount_sock.desc b/test/zdtm/static/overmount_sock.desc
index 95c58b4..1ba68c3 100644
--- a/test/zdtm/static/overmount_sock.desc
+++ b/test/zdtm/static/overmount_sock.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flavor' : 'ns uns', 'flags': 'suid crfail'}
diff --git a/test/zdtm/static/pty02.desc b/test/zdtm/static/pty02.desc
deleted file mode 100644
index 95c58b4..0000000
--- a/test/zdtm/static/pty02.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/static/socket-closed-tcp.desc b/test/zdtm/static/socket-closed-tcp.desc
index 95c58b4..ded8987 100644
--- a/test/zdtm/static/socket-closed-tcp.desc
+++ b/test/zdtm/static/socket-closed-tcp.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags': 'crfail'}
diff --git a/test/zdtm/static/socket_aio.desc b/test/zdtm/static/socket_aio.desc
index 95c58b4..6b0e5a3 100644
--- a/test/zdtm/static/socket_aio.desc
+++ b/test/zdtm/static/socket_aio.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'opts': '--tcp-established'}
diff --git a/test/zdtm/static/tty00.desc b/test/zdtm/static/tty00.desc
deleted file mode 100644
index 95c58b4..0000000
--- a/test/zdtm/static/tty00.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/static/unhashed_proc.desc b/test/zdtm/static/unhashed_proc.desc
index 95c58b4..847e3b2 100644
--- a/test/zdtm/static/unhashed_proc.desc
+++ b/test/zdtm/static/unhashed_proc.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags': 'crfail', 'opts' : '--link-remap'}
diff --git a/test/zdtm/static/unlink_largefile.desc b/test/zdtm/static/unlink_largefile.desc
index 95c58b4..ded8987 100644
--- a/test/zdtm/static/unlink_largefile.desc
+++ b/test/zdtm/static/unlink_largefile.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags': 'crfail'}
diff --git a/test/zdtm/static/unlink_regular00.desc b/test/zdtm/static/unlink_regular00.desc
index 53aea56..e49bbfb 100644
--- a/test/zdtm/static/unlink_regular00.desc
+++ b/test/zdtm/static/unlink_regular00.desc
@@ -1 +1 @@
-{'flavor': 'ns', 'flags': 'suid noauto'}
+{'flavor': 'ns', 'flags': 'suid crfail'}
diff --git a/test/zdtm/transition/epoll.desc b/test/zdtm/transition/epoll.desc
deleted file mode 100644
index 95c58b4..0000000
--- a/test/zdtm/transition/epoll.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/fifo_loop.desc b/test/zdtm/transition/fifo_loop.desc
deleted file mode 100644
index 95c58b4..0000000
--- a/test/zdtm/transition/fifo_loop.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/file_aio.desc b/test/zdtm/transition/file_aio.desc
deleted file mode 100644
index 95c58b4..0000000
--- a/test/zdtm/transition/file_aio.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/netlink00.desc b/test/zdtm/transition/netlink00.desc
index 95c58b4..1e9fff8 100644
--- a/test/zdtm/transition/netlink00.desc
+++ b/test/zdtm/transition/netlink00.desc
@@ -1 +1 @@
-{'flags': 'noauto'}
+{'flags': 'suid noauto'}
diff --git a/test/zdtm/transition/socket_loop00.desc b/test/zdtm/transition/socket_loop00.desc
deleted file mode 100644
index 95c58b4..0000000
--- a/test/zdtm/transition/socket_loop00.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
diff --git a/test/zdtm/transition/unix_sock.desc b/test/zdtm/transition/unix_sock.desc
deleted file mode 100644
index 95c58b4..0000000
--- a/test/zdtm/transition/unix_sock.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'noauto'}
-- 
2.7.4