Skip to content

Commit 221e455

Browse files
matttbedavem330
authored andcommitted
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: multipath-tcp/mptcp_net-next#368 Fixes: 5fb62e9 ("selftests: mptcp: add tproxy test case") Cc: [email protected] Acked-by: Paolo Abeni <[email protected]> Signed-off-by: Matthieu Baerts <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0226436 commit 221e455

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

tools/testing/selftests/net/mptcp/mptcp_connect.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ table inet mangle {
718718
EOF
719719
if [ $? -ne 0 ]; then
720720
echo "SKIP: $msg, could not load nft ruleset"
721+
mptcp_lib_fail_if_expected_feature "nft rules"
721722
return
722723
fi
723724

@@ -733,6 +734,7 @@ EOF
733734
if [ $? -ne 0 ]; then
734735
ip netns exec "$listener_ns" nft flush ruleset
735736
echo "SKIP: $msg, ip $r6flag rule failed"
737+
mptcp_lib_fail_if_expected_feature "ip rule"
736738
return
737739
fi
738740

@@ -741,6 +743,7 @@ EOF
741743
ip netns exec "$listener_ns" nft flush ruleset
742744
ip -net "$listener_ns" $r6flag rule del fwmark 1 lookup 100
743745
echo "SKIP: $msg, ip route add local $local_addr failed"
746+
mptcp_lib_fail_if_expected_feature "ip route"
744747
return
745748
fi
746749

0 commit comments

Comments
 (0)