aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>2024-02-15 19:25:38 +0100
committerDavid S. Miller <davem@davemloft.net>2024-02-18 10:25:00 +0000
commit2ef0d804c090658960c008446523863fd7e3541e (patch)
treeae80162fd9d38b12b47d7a749f92dc7368145923
parent4d8e0dde0403b5a86aa83e243f020711a9c3e31f (diff)
downloadlinux-2ef0d804c090658960c008446523863fd7e3541e.tar.gz
selftests: mptcp: userspace_pm: unique subtest names
It is important to have a unique (sub)test name in TAP, because some CI environments drop tests with duplicated names. Some subtests from the userspace_pm selftest had the same names. That's because different subflows are created (and deleted) between the same pair of IP addresses. Simply adding the destination port in the name is then enough to have different names, because the destination port is always different. Note that adding such info takes a bit more space, so we need to increase a bit the width to print the name, simply to keep all the '[ OK ]' aligned as before. Fixes: f589234e1af0 ("selftests: mptcp: userspace_pm: format subtests results in TAP") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang <geliang@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Notes
Fixes: f589234e1af0 ("selftests: mptcp: userspace_pm: format subtests results in TAP") # v6.6-rc1 Stable: 5b9bc8e6275a # v6.6.19 Lore: https://lore.kernel.org/r/20240227131632.152833129@linuxfoundation.org # linux-patches, stable Lore: https://lore.kernel.org/r/20240227131637.839013727@linuxfoundation.org # linux-patches, stable
-rwxr-xr-xtools/testing/selftests/net/mptcp/userspace_pm.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 6167837f48e17e..1b94a75604fee9 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -75,7 +75,7 @@ print_test()
{
test_name="${1}"
- _printf "%-63s" "${test_name}"
+ _printf "%-68s" "${test_name}"
}
print_results()
@@ -542,7 +542,7 @@ verify_subflow_events()
local remid
local info
- info="${e_saddr} (${e_from}) => ${e_daddr} (${e_to})"
+ info="${e_saddr} (${e_from}) => ${e_daddr}:${e_dport} (${e_to})"
if [ "$e_type" = "$SUB_ESTABLISHED" ]
then