mirror of https://github.com/torvalds/linux.git
selftests: mptcp: lib: remove stats files args
Now that these files are written from MPTCP lib helpers, the stats file paths are uniformed. Then, no need to specify them from the each selftest. No behavioural changes intended. Acked-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20251114-net-next-mptcp-sft-count-cache-stats-timeout-v1-2-863cb04e1b7b@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
d3305c016a
commit
a89fc262b6
|
|
@ -444,8 +444,7 @@ do_transfer()
|
|||
printf "(duration %05sms) " "${duration}"
|
||||
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
|
||||
mptcp_lib_pr_fail "client exit code $retc, server $rets"
|
||||
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}" \
|
||||
"/tmp/${listener_ns}.out" "/tmp/${connector_ns}.out"
|
||||
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}"
|
||||
|
||||
echo
|
||||
cat "$capout"
|
||||
|
|
|
|||
|
|
@ -1071,8 +1071,7 @@ do_transfer()
|
|||
|
||||
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
|
||||
fail_test "client exit code $retc, server $rets"
|
||||
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}" \
|
||||
"/tmp/${listener_ns}.out" "/tmp/${connector_ns}.out"
|
||||
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -106,23 +106,28 @@ mptcp_lib_pr_info() {
|
|||
mptcp_lib_print_info "INFO: ${*}"
|
||||
}
|
||||
|
||||
# $1-2: listener/connector ns ; $3 port ; $4-5 listener/connector stat file
|
||||
mptcp_lib_pr_nstat() {
|
||||
local ns="${1}"
|
||||
local hist="/tmp/${ns}.out"
|
||||
|
||||
cat "${hist}"
|
||||
}
|
||||
|
||||
# $1-2: listener/connector ns ; $3 port
|
||||
mptcp_lib_pr_err_stats() {
|
||||
local lns="${1}"
|
||||
local cns="${2}"
|
||||
local port="${3}"
|
||||
local lstat="${4}"
|
||||
local cstat="${5}"
|
||||
|
||||
echo -en "${MPTCP_LIB_COLOR_RED}"
|
||||
{
|
||||
printf "\nnetns %s (listener) socket stat for %d:\n" "${lns}" "${port}"
|
||||
ip netns exec "${lns}" ss -Menitam -o "sport = :${port}"
|
||||
cat "${lstat}"
|
||||
mptcp_lib_pr_nstat "${lns}"
|
||||
|
||||
printf "\nnetns %s (connector) socket stat for %d:\n" "${cns}" "${port}"
|
||||
ip netns exec "${cns}" ss -Menitam -o "dport = :${port}"
|
||||
[ "${lstat}" != "${cstat}" ] && cat "${cstat}"
|
||||
[ "${lns}" != "${cns}" ] && mptcp_lib_pr_nstat "${cns}"
|
||||
} 1>&2
|
||||
echo -en "${MPTCP_LIB_COLOR_RESET}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,8 +198,7 @@ do_transfer()
|
|||
print_title "Transfer ${ip:2}"
|
||||
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
|
||||
mptcp_lib_pr_fail "client exit code $retc, server $rets"
|
||||
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}" \
|
||||
"/tmp/${listener_ns}.out" "/tmp/${connector_ns}.out"
|
||||
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}"
|
||||
|
||||
mptcp_lib_result_fail "transfer ${ip}"
|
||||
|
||||
|
|
|
|||
|
|
@ -200,8 +200,7 @@ do_transfer()
|
|||
fi
|
||||
|
||||
mptcp_lib_pr_fail "client exit code $retc, server $rets"
|
||||
mptcp_lib_pr_err_stats "${ns3}" "${ns1}" "${port}" \
|
||||
"/tmp/${ns3}.out" "/tmp/${ns1}.out"
|
||||
mptcp_lib_pr_err_stats "${ns3}" "${ns1}" "${port}"
|
||||
ls -l $sin $cout
|
||||
ls -l $cin $sout
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue