.../testing/selftests/net/mptcp/mptcp_join.sh | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-)
From: Geliang Tang <tanggeliang@kylinos.cn>
The four checksum tests are similar, only one line is different. So
a for-loop can be used to simplify these tests.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
RESEND:
- update the email address.
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 43 +++++--------------
1 file changed, 11 insertions(+), 32 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 4df48f1f14ab..63b29504e547 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -337,7 +337,7 @@ reset_with_checksum()
local ns1_enable=$1
local ns2_enable=$2
- reset "checksum test ${1} ${2}" || return 1
+ reset "checksum test ${ns1_enable} ${ns2_enable}" || return 1
ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=$ns1_enable
ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=$ns2_enable
@@ -2912,37 +2912,16 @@ syncookies_tests()
checksum_tests()
{
- # checksum test 0 0
- if reset_with_checksum 0 0; then
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr 0 0 0
- fi
-
- # checksum test 1 1
- if reset_with_checksum 1 1; then
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr 0 0 0
- fi
-
- # checksum test 0 1
- if reset_with_checksum 0 1; then
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr 0 0 0
- fi
-
- # checksum test 1 0
- if reset_with_checksum 1 0; then
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr 0 0 0
- fi
+ local checksum_enable
+ for checksum_enable in "0 0" "1 1" "0 1" "1 0"; do
+ # checksum test 0 0, 1 1, 0 1, 1 0
+ if reset_with_checksum ${checksum_enable}; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr 0 0 0
+ fi
+ done
}
deny_join_id0_tests()
--
2.43.0
Hi Geliang, On 28/07/2024 05:49, Geliang Tang wrote: > From: Geliang Tang <tanggeliang@kylinos.cn> > > The four checksum tests are similar, only one line is different. So > a for-loop can be used to simplify these tests. Thank you for the patch. Now in our tree: New patches for t/upstream: - 58ec41767aea: selftests: mptcp: join: simplify checksum_tests - Results: 65e9f14d80cb..005b14c6d7b9 (export) Tests are now in progress: - export: https://github.com/multipath-tcp/mptcp_net-next/commit/7812921044e786f1d6fdf3c896dcbadcdf6fec16/checks Cheers, Matt -- Sponsored by the NGI0 Core fund.
Hi Geliang, On 28/07/2024 05:49, Geliang Tang wrote: > From: Geliang Tang <tanggeliang@kylinos.cn> > > The four checksum tests are similar, only one line is different. So > a for-loop can be used to simplify these tests. I usually prefer distinct tests, if we want to extend them, or easily check something else, but these checksum tests are a bit particular. Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Cheers, Matt -- Sponsored by the NGI0 Core fund.
© 2016 - 2024 Red Hat, Inc.