From aa772bf286e6c082fb97b61d8079c0afcc9fb49c Mon Sep 17 00:00:00 2001 From: Zeyad Yasser Date: Tue, 17 Aug 2021 22:15:26 +0200 Subject: [PATCH] zdtm: fix network lock tests when run with --norst In test/jenkins/{crit.sh,criu-dump}, ZDTM is run with --norst, Causing tests to only go through dump wihtout restoring. The network locking tests are highly dependant on dump/restore hooks causing them to hang when run with --norst. We just add a reqrst flag to all network lock tests. Signed-off-by: Zeyad Yasser --- test/zdtm/static/net_lock_socket_iptables.desc | 2 +- test/zdtm/static/net_lock_socket_iptables6.desc | 2 +- test/zdtm/static/net_lock_socket_nftables.desc | 2 +- test/zdtm/static/net_lock_socket_nftables6.desc | 2 +- test/zdtm/static/netns_lock_iptables.desc | 2 +- test/zdtm/static/netns_lock_nftables.desc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/zdtm/static/net_lock_socket_iptables.desc b/test/zdtm/static/net_lock_socket_iptables.desc index 1e233132d..936ff8702 100644 --- a/test/zdtm/static/net_lock_socket_iptables.desc +++ b/test/zdtm/static/net_lock_socket_iptables.desc @@ -1,6 +1,6 @@ { 'flavor': 'h', - 'flags': 'suid excl', + 'flags': 'suid excl reqrst', 'dopts': '--tcp-established --network-lock iptables', 'ropts': '--tcp-established', } diff --git a/test/zdtm/static/net_lock_socket_iptables6.desc b/test/zdtm/static/net_lock_socket_iptables6.desc index 1e233132d..936ff8702 100644 --- a/test/zdtm/static/net_lock_socket_iptables6.desc +++ b/test/zdtm/static/net_lock_socket_iptables6.desc @@ -1,6 +1,6 @@ { 'flavor': 'h', - 'flags': 'suid excl', + 'flags': 'suid excl reqrst', 'dopts': '--tcp-established --network-lock iptables', 'ropts': '--tcp-established', } diff --git a/test/zdtm/static/net_lock_socket_nftables.desc b/test/zdtm/static/net_lock_socket_nftables.desc index d3b82067f..c34398a4a 100644 --- a/test/zdtm/static/net_lock_socket_nftables.desc +++ b/test/zdtm/static/net_lock_socket_nftables.desc @@ -1,6 +1,6 @@ { 'flavor': 'h', - 'flags': 'suid excl', + 'flags': 'suid excl reqrst', 'feature': 'network_lock_nftables', 'dopts': '--tcp-established --network-lock nftables', 'ropts': '--tcp-established', diff --git a/test/zdtm/static/net_lock_socket_nftables6.desc b/test/zdtm/static/net_lock_socket_nftables6.desc index d3b82067f..c34398a4a 100644 --- a/test/zdtm/static/net_lock_socket_nftables6.desc +++ b/test/zdtm/static/net_lock_socket_nftables6.desc @@ -1,6 +1,6 @@ { 'flavor': 'h', - 'flags': 'suid excl', + 'flags': 'suid excl reqrst', 'feature': 'network_lock_nftables', 'dopts': '--tcp-established --network-lock nftables', 'ropts': '--tcp-established', diff --git a/test/zdtm/static/netns_lock_iptables.desc b/test/zdtm/static/netns_lock_iptables.desc index 52d4177e0..69020f34e 100644 --- a/test/zdtm/static/netns_lock_iptables.desc +++ b/test/zdtm/static/netns_lock_iptables.desc @@ -1,6 +1,6 @@ { 'flavor': 'h', - 'flags': 'suid excl', + 'flags': 'suid excl reqrst', 'opts': '--tcp-established', 'dopts': '--network-lock iptables', 'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test' diff --git a/test/zdtm/static/netns_lock_nftables.desc b/test/zdtm/static/netns_lock_nftables.desc index 7ed5b3358..fe1a86e4f 100644 --- a/test/zdtm/static/netns_lock_nftables.desc +++ b/test/zdtm/static/netns_lock_nftables.desc @@ -1,6 +1,6 @@ { 'flavor': 'h', - 'flags': 'suid excl', + 'flags': 'suid excl reqrst', 'feature': 'network_lock_nftables', 'opts': '--tcp-established', 'dopts': '--network-lock nftables',