selftests: mptcp: connect: fail if nft supposed to work

In case of "external" errors when preparing the environment for the
TProxy tests, the subtests were marked as skipped.

This is fine but it means these errors are ignored. On MPTCP Public CI,
we do want to catch such issues and mark the selftest as failed if there
are such issues. We can then use mptcp_lib_fail_if_expected_feature()
helper that has been recently added to fail if needed.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: 5fb62e9cd3ad ("selftests: mptcp: add tproxy test case")
Cc: stable@vger.kernel.org
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 13561e5bc0cdba4118c8e977750794d04e714b24..bbae40882bfaf4afb8269cf9b4193c93ddf3ebb7 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -718,6 +718,7 @@ table inet mangle {
 EOF
        if [ $? -ne 0 ]; then
                echo "SKIP: $msg, could not load nft ruleset"
 EOF
        if [ $? -ne 0 ]; then
                echo "SKIP: $msg, could not load nft ruleset"

+               mptcp_lib_fail_if_expected_feature "nft rules"

                return
        fi
 
                return
        fi
 


@@ -733,6 +734,7 @@ EOF
        if [ $? -ne 0 ]; then
                ip netns exec "$listener_ns" nft flush ruleset
                echo "SKIP: $msg, ip $r6flag rule failed"
        if [ $? -ne 0 ]; then
                ip netns exec "$listener_ns" nft flush ruleset
                echo "SKIP: $msg, ip $r6flag rule failed"

+               mptcp_lib_fail_if_expected_feature "ip rule"

                return
        fi
 
                return
        fi
 


@@ -741,6 +743,7 @@ EOF
                ip netns exec "$listener_ns" nft flush ruleset
                ip -net "$listener_ns" $r6flag rule del fwmark 1 lookup 100
                echo "SKIP: $msg, ip route add local $local_addr failed"
                ip netns exec "$listener_ns" nft flush ruleset
                ip -net "$listener_ns" $r6flag rule del fwmark 1 lookup 100
                echo "SKIP: $msg, ip route add local $local_addr failed"

+               mptcp_lib_fail_if_expected_feature "ip route"

                return
        fi
 
                return
        fi