Skip to content

Commit

Permalink
selftests: mptcp: join: more explicit check name
Browse files Browse the repository at this point in the history 
Before, the check names had to be very short. It is no longer the case
now that these checks are printed on a dedicated line.

Then, it looks better to have more explicit names.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240902-net-next-mptcp-mib-mpjtx-misc-v1-7-d3e0f3773b90@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Matthieu Baerts (NGI0) authored and Jakub Kicinski committed Sep 3, 2024
1 parent 004125c commit 6ed4953
Showing 1 changed file with 33 additions and 32 deletions.
65 changes: 33 additions & 32 deletions tools/testing/selftests/net/mptcp/mptcp_join.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ chk_cestab_nr()
local cestab=$2
local count

print_check "cestab $cestab"
print_check "currently established: $cestab"
count=$(mptcp_lib_get_counter ${ns} "MPTcpExtMPCurrEstab")
if [ -z "$count" ]; then
print_skip
Expand Down Expand Up @@ -1141,7 +1141,7 @@ chk_csum_nr()
csum_ns2=${csum_ns2:1}
fi

print_check "sum"
print_check "checksum server"
count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtDataCsumErr")
if [ -n "$count" ] && [ "$count" != "$csum_ns1" ]; then
extra_msg+=" ns1=$count"
Expand All @@ -1154,7 +1154,8 @@ chk_csum_nr()
else
print_ok
fi
print_check "csum"

print_check "checksum client"
count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtDataCsumErr")
if [ -n "$count" ] && [ "$count" != "$csum_ns2" ]; then
extra_msg+=" ns2=$count"
Expand Down Expand Up @@ -1198,7 +1199,7 @@ chk_fail_nr()
fail_rx=${fail_rx:1}
fi

print_check "ftx"
print_check "fail tx"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx")
if [ -n "$count" ] && [ "$count" != "$fail_tx" ]; then
extra_msg+=",tx=$count"
Expand All @@ -1212,7 +1213,7 @@ chk_fail_nr()
print_ok
fi

print_check "failrx"
print_check "fail rx"
count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx")
if [ -n "$count" ] && [ "$count" != "$fail_rx" ]; then
extra_msg+=",rx=$count"
Expand Down Expand Up @@ -1245,7 +1246,7 @@ chk_fclose_nr()
extra_msg="invert"
fi

print_check "ctx"
print_check "fast close tx"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFastcloseTx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1256,7 +1257,7 @@ chk_fclose_nr()
print_ok
fi

print_check "fclzrx"
print_check "fast close rx"
count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFastcloseRx")
if [ -z "$count" ]; then
print_skip
Expand Down Expand Up @@ -1286,7 +1287,7 @@ chk_rst_nr()
extra_msg="invert"
fi

print_check "rtx"
print_check "reset tx"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPRstTx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1298,7 +1299,7 @@ chk_rst_nr()
print_ok
fi

print_check "rstrx"
print_check "reset rx"
count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPRstRx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1319,7 +1320,7 @@ chk_infi_nr()
local infi_rx=$2
local count

print_check "itx"
print_check "infi tx"
count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtInfiniteMapTx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1329,7 +1330,7 @@ chk_infi_nr()
print_ok
fi

print_check "infirx"
print_check "infi rx"
count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtInfiniteMapRx")
if [ -z "$count" ]; then
print_skip
Expand Down Expand Up @@ -1412,8 +1413,8 @@ chk_join_nr()
rc=${KSFT_SKIP}
elif [ "$count" != "$syn_nr" ]; then
rc=${KSFT_FAIL}
print_check "syn"
fail_test "got $count JOIN[s] syn expected $syn_nr"
print_check "syn rx"
fail_test "got $count JOIN[s] syn rx expected $syn_nr"
fi

with_cookie=$(ip netns exec $ns2 sysctl -n net.ipv4.tcp_syncookies)
Expand All @@ -1426,8 +1427,8 @@ chk_join_nr()
# the subflow creation
if [ "$with_cookie" != 2 ] || [ "$count" -le "$syn_ack_nr" ] || [ "$count" -gt "$syn_nr" ]; then
rc=${KSFT_FAIL}
print_check "synack"
fail_test "got $count JOIN[s] synack expected $syn_ack_nr"
print_check "synack rx"
fail_test "got $count JOIN[s] synack rx expected $syn_ack_nr"
fi
fi

Expand All @@ -1436,8 +1437,8 @@ chk_join_nr()
rc=${KSFT_SKIP}
elif [ "$count" != "$ack_nr" ]; then
rc=${KSFT_FAIL}
print_check "ack"
fail_test "got $count JOIN[s] ack expected $ack_nr"
print_check "ack rx"
fail_test "got $count JOIN[s] ack rx expected $ack_nr"
fi

print_results "join Rx" ${rc}
Expand Down Expand Up @@ -1517,7 +1518,7 @@ chk_add_nr()

timeout=$(ip netns exec ${ns_tx} sysctl -n net.mptcp.add_addr_timeout)

print_check "add"
print_check "add addr rx"
count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtAddAddr")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1529,7 +1530,7 @@ chk_add_nr()
print_ok
fi

print_check "echo"
print_check "add addr echo rx"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtEchoAdd")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1540,7 +1541,7 @@ chk_add_nr()
fi

if [ $port_nr -gt 0 ]; then
print_check "pt"
print_check "add addr rx with port"
count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtPortAdd")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1550,7 +1551,7 @@ chk_add_nr()
print_ok
fi

print_check "syn"
print_check "syn rx port"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortSynRx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1561,7 +1562,7 @@ chk_add_nr()
print_ok
fi

print_check "synack"
print_check "synack rx port"
count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPJoinPortSynAckRx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1572,7 +1573,7 @@ chk_add_nr()
print_ok
fi

print_check "ack"
print_check "ack rx port"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPJoinPortAckRx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1583,7 +1584,7 @@ chk_add_nr()
print_ok
fi

print_check "syn"
print_check "syn rx port mismatch"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortSynRx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1594,7 +1595,7 @@ chk_add_nr()
print_ok
fi

print_check "ack"
print_check "ack rx port mismatch"
count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMismatchPortAckRx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1618,7 +1619,7 @@ chk_add_tx_nr()

timeout=$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout)

print_check "add TX"
print_check "add addr tx"
count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtAddAddrTx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1630,7 +1631,7 @@ chk_add_tx_nr()
print_ok
fi

print_check "echo TX"
print_check "add addr echo tx"
count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtEchoAddTx")
if [ -z "$count" ]; then
print_skip
Expand Down Expand Up @@ -1668,7 +1669,7 @@ chk_rm_nr()
extra_msg="invert"
fi

print_check "rm"
print_check "rm addr rx"
count=$(mptcp_lib_get_counter ${addr_ns} "MPTcpExtRmAddr")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1678,7 +1679,7 @@ chk_rm_nr()
print_ok
fi

print_check "rmsf"
print_check "rm subflow"
count=$(mptcp_lib_get_counter ${subflow_ns} "MPTcpExtRmSubflow")
if [ -z "$count" ]; then
print_skip
Expand Down Expand Up @@ -1713,7 +1714,7 @@ chk_rm_tx_nr()
{
local rm_addr_tx_nr=$1

print_check "rm TX"
print_check "rm addr tx"
count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtRmAddrTx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1732,7 +1733,7 @@ chk_prio_nr()
local mpj_syn_ack=$4
local count

print_check "ptx"
print_check "mp_prio tx"
count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioTx")
if [ -z "$count" ]; then
print_skip
Expand All @@ -1742,7 +1743,7 @@ chk_prio_nr()
print_ok
fi

print_check "prx"
print_check "mp_prio rx"
count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPPrioRx")
if [ -z "$count" ]; then
print_skip
Expand Down

0 comments on commit 6ed4953

Please sign in to comment.