Skip to content

Commit

Permalink
selftests: mptcp: userspace_pm: format subtests results in TAP
Browse files Browse the repository at this point in the history
The current selftests infrastructure formats the results in TAP 13. This
version doesn't support subtests and only the end result of each
selftest is taken into account. It means that a single issue in a
subtest of a selftest containing multiple subtests forces the whole
selftest to be marked as failed. It also means that subtests results are
not tracked by CIs executing selftests.

MPTCP selftests run hundreds of various subtests. It is then important
to track each of them and not one result per selftest.

It is particularly interesting to do that when validating stable kernels
with the last version of the test suite: tests might fail because a
feature is not supported but the test didn't skip that part. In this
case, if subtests are not tracked, the whole selftest will be marked as
failed making the other subtests useless because their results are
ignored.

This patch formats subtests results in TAP in userspace_pm.sh selftest.

Link: multipath-tcp/mptcp_net-next#368
Signed-off-by: Matthieu Baerts <[email protected]>
  • Loading branch information
matttbe authored and intel-lab-lkp committed Jun 21, 2023
1 parent 1520220 commit 24b9192
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion tools/testing/selftests/net/mptcp/userspace_pm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX)
ns1="ns1-$rndh"
ns2="ns2-$rndh"
ret=0
test_name=""

_printf() {
stdbuf -o0 -e0 printf "${@}"
}
Expand All @@ -71,7 +73,9 @@ print_title()
# $1: test name
print_test()
{
_printf "%-63s" "${1}"
test_name="${1}"

_printf "%-63s" "${test_name}"
}

print_results()
Expand All @@ -82,11 +86,13 @@ print_results()
test_pass()
{
print_results " OK "
mptcp_lib_result_pass "${test_name}"
}

test_skip()
{
print_results "SKIP"
mptcp_lib_result_skip "${test_name}"
}

# $1: msg
Expand All @@ -98,6 +104,8 @@ test_fail()
if [ -n "${1}" ]; then
_printf "\t%s\n" "${1}"
fi

mptcp_lib_result_fail "${test_name}"
}

kill_wait()
Expand Down Expand Up @@ -255,6 +263,7 @@ make_connection()
test_pass
else
test_fail "Expected tokens (c:${client_token} - s:${server_token}) and server (c:${client_serverside} - s:${server_serverside})"
mptcp_lib_result_print_all_tap
exit 1
fi

Expand Down Expand Up @@ -990,4 +999,5 @@ test_subflows_v4_v6_mix
test_prio
test_listener

mptcp_lib_result_print_all_tap
exit ${ret}

0 comments on commit 24b9192

Please sign in to comment.