selftests: mptcp: join: mark 'fail' tests as flaky

These tests are rarely unstable. It depends on the CI running the tests,
especially if it is also busy doing other tasks in parallel, and if a
debug kernel config is being used.

It looks like this issue is sometimes present with the NetDev CI. While
this is being investigated, the tests are marked as flaky not to create
noises on such CIs.

Fixes: b6e074e171bc ("selftests: mptcp: add infinite map testcase")
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/491
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-4-a352362f3f8e@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index b869b46823d7ab7d8565de82b20e23b92d5630d0..2b66c5fa71ebff7bf93f712aecab26e7e77134e3 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3101,6 +3101,7 @@ fail_tests()
 {
        # single subflow
        if reset_with_fail "Infinite map" 1; then
+               MPTCP_LIB_SUBTEST_FLAKY=1
                test_linkfail=128 \
                        run_tests $ns1 $ns2 10.0.1.1
                chk_join_nr 0 0 0 +1 +0 1 0 1 "$(pedit_action_pkts)"
@@ -3109,6 +3110,7 @@ fail_tests()
 
        # multiple subflows
        if reset_with_fail "MP_FAIL MP_RST" 2; then
+               MPTCP_LIB_SUBTEST_FLAKY=1
                tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5ms
                pm_nl_set_limits $ns1 0 1
                pm_nl_set_limits $ns2 0 1