* [PATCH mptcp-next v2 1/9] Squash to "selftests: mptcp: join: allow running -cCi"
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 2/9] selftests: mptcp: join: define tests groups once Matthieu Baerts
` (8 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
The recommended way with getopt is first parse all options and then act.
This allows to do some actions in priority, e.g. display the help menu
and stop.
But also some global variables changing the behaviour of this selftests
-- like the ones behind -cCi options -- can be set before running the
different tests. By doing that, we can also avoid long and unreadable
regex.
This can be squashed in "selftests: mptcp: join: allow running -cCi" and
the commit message can be appended with what is above.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
Notes:
to be squashed in "selftests: mptcp: join: allow running -cCi"
.../testing/selftests/net/mptcp/mptcp_join.sh | 67 ++++++++-----------
1 file changed, 28 insertions(+), 39 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index b48b11714817..13f78d4434d2 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -17,7 +17,6 @@ capture=0
checksum=0
ip_mptcp=0
check_invert=0
-do_all_tests=1
init=0
TEST_COUNT=0
@@ -2256,84 +2255,66 @@ usage()
exit ${ret}
}
-for arg in "$@"; do
- # check for "capture/checksum" args before launching tests
- if [[ "${arg}" =~ ^"-"[0-9a-zA-Z]*"c"[0-9a-zA-Z]*$ ]]; then
- capture=1
- fi
- if [[ "${arg}" =~ ^"-"[0-9a-zA-Z]*"C"[0-9a-zA-Z]*$ ]]; then
- checksum=1
- fi
- if [[ "${arg}" =~ ^"-"[0-9a-zA-Z]*"i"[0-9a-zA-Z]*$ ]]; then
- ip_mptcp=1
- fi
-
- # exception for the capture/checksum/ip_mptcp options, the rest means: a part of the tests
- if ! [[ "${arg}" =~ ^"-"[cCi]+$ ]]; then
- do_all_tests=0
- fi
-done
-
-if [ $do_all_tests -eq 1 ]; then
- all_tests
- exit $ret
-fi
+tests=()
while getopts 'fesltra64bpkdmuchCSi' opt; do
case $opt in
f)
- subflows_tests
+ tests+=(subflows_tests)
;;
e)
- subflows_error_tests
+ tests+=(subflows_error_tests)
;;
s)
- signal_address_tests
+ tests+=(signal_address_tests)
;;
l)
- link_failure_tests
+ tests+=(link_failure_tests)
;;
t)
- add_addr_timeout_tests
+ tests+=(add_addr_timeout_tests)
;;
r)
- remove_tests
+ tests+=(remove_tests)
;;
a)
- add_tests
+ tests+=(add_tests)
;;
6)
- ipv6_tests
+ tests+=(ipv6_tests)
;;
4)
- v4mapped_tests
+ tests+=(v4mapped_tests)
;;
b)
- backup_tests
+ tests+=(backup_tests)
;;
p)
- add_addr_ports_tests
+ tests+=(add_addr_ports_tests)
;;
k)
- syncookies_tests
+ tests+=(syncookies_tests)
;;
S)
- checksum_tests
+ tests+=(checksum_tests)
;;
d)
- deny_join_id0_tests
+ tests+=(deny_join_id0_tests)
;;
m)
- fullmesh_tests
+ tests+=(fullmesh_tests)
;;
u)
- userspace_tests
+ tests+=(userspace_tests)
;;
c)
+ capture=1
;;
C)
+ checksum=1
;;
i)
+ ip_mptcp=1
;;
h)
usage
@@ -2344,4 +2325,12 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do
esac
done
+if [ ${#tests[@]} -eq 0 ]; then
+ all_tests
+else
+ for subtests in "${tests[@]}"; do
+ "${subtests}"
+ done
+fi
+
exit $ret
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH mptcp-next v2 2/9] selftests: mptcp: join: define tests groups once
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 1/9] Squash to "selftests: mptcp: join: allow running -cCi" Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 3/9] selftests: mptcp: join: reset failing links Matthieu Baerts
` (7 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
When defining a new tests group, it has to be define in multiple places:
- in the all_tests() function
- in the 'usage()' function
- in the getopts: short option + what to do when the option is used
Because it is easy to forget one of them, it is useful to have to define
them only once.
Note: only using an associative array would simplify the code but the
entries are stored in a hashtable and iterating over the different items
doesn't give the same order as the one used in the declaration of this
array. Because we want to run these tests in the same order as before, a
"simple" array is used first.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 135 ++++++------------
1 file changed, 46 insertions(+), 89 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 13f78d4434d2..747dd6d887ea 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -19,6 +19,7 @@ ip_mptcp=0
check_invert=0
init=0
+declare -A all_tests
TEST_COUNT=0
nr_blank=40
@@ -2202,26 +2203,6 @@ userspace_tests()
chk_rm_nr 0 0
}
-all_tests()
-{
- subflows_tests
- subflows_error_tests
- signal_address_tests
- link_failure_tests
- add_addr_timeout_tests
- remove_tests
- add_tests
- ipv6_tests
- v4mapped_tests
- backup_tests
- add_addr_ports_tests
- syncookies_tests
- checksum_tests
- deny_join_id0_tests
- fullmesh_tests
- userspace_tests
-}
-
# [$1: error message]
usage()
{
@@ -2231,22 +2212,12 @@ usage()
fi
echo "mptcp_join usage:"
- echo " -f subflows_tests"
- echo " -e subflows_error_tests"
- echo " -s signal_address_tests"
- echo " -l link_failure_tests"
- echo " -t add_addr_timeout_tests"
- echo " -r remove_tests"
- echo " -a add_tests"
- echo " -6 ipv6_tests"
- echo " -4 v4mapped_tests"
- echo " -b backup_tests"
- echo " -p add_addr_ports_tests"
- echo " -k syncookies_tests"
- echo " -S checksum_tests"
- echo " -d deny_join_id0_tests"
- echo " -m fullmesh_tests"
- echo " -u userspace_tests"
+
+ local key
+ for key in "${!all_tests[@]}"; do
+ echo " -${key} ${all_tests[${key}]}"
+ done
+
echo " -c capture pcap files"
echo " -C enable data checksum"
echo " -i use ip mptcp"
@@ -2256,56 +2227,42 @@ usage()
}
+# Use a "simple" array to force an specific order we cannot have with an associative one
+all_tests_sorted=(
+ f@subflows_tests
+ e@subflows_error_tests
+ s@signal_address_tests
+ l@link_failure_tests
+ t@add_addr_timeout_tests
+ r@remove_tests
+ a@add_tests
+ 6@ipv6_tests
+ 4@v4mapped_tests
+ b@backup_tests
+ p@add_addr_ports_tests
+ k@syncookies_tests
+ S@checksum_tests
+ d@deny_join_id0_tests
+ m@fullmesh_tests
+ u@userspace_tests
+)
+
+all_tests_args=""
+all_tests_names=()
+for subtests in "${all_tests_sorted[@]}"; do
+ key="${subtests%@*}"
+ value="${subtests#*@}"
+
+ all_tests_args+="${key}"
+ all_tests_names+=("${value}")
+ all_tests[${key}]="${value}"
+done
+
tests=()
-while getopts 'fesltra64bpkdmuchCSi' opt; do
+while getopts "${all_tests_args}cCih" opt; do
case $opt in
- f)
- tests+=(subflows_tests)
- ;;
- e)
- tests+=(subflows_error_tests)
- ;;
- s)
- tests+=(signal_address_tests)
- ;;
- l)
- tests+=(link_failure_tests)
- ;;
- t)
- tests+=(add_addr_timeout_tests)
- ;;
- r)
- tests+=(remove_tests)
- ;;
- a)
- tests+=(add_tests)
- ;;
- 6)
- tests+=(ipv6_tests)
- ;;
- 4)
- tests+=(v4mapped_tests)
- ;;
- b)
- tests+=(backup_tests)
- ;;
- p)
- tests+=(add_addr_ports_tests)
- ;;
- k)
- tests+=(syncookies_tests)
- ;;
- S)
- tests+=(checksum_tests)
- ;;
- d)
- tests+=(deny_join_id0_tests)
- ;;
- m)
- tests+=(fullmesh_tests)
- ;;
- u)
- tests+=(userspace_tests)
+ ["${all_tests_args}"])
+ tests+=("${all_tests[${opt}]}")
;;
c)
capture=1
@@ -2326,11 +2283,11 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do
done
if [ ${#tests[@]} -eq 0 ]; then
- all_tests
-else
- for subtests in "${tests[@]}"; do
- "${subtests}"
- done
+ tests=("${all_tests_names[@]}")
fi
+for subtests in "${tests[@]}"; do
+ "${subtests}"
+done
+
exit $ret
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH mptcp-next v2 3/9] selftests: mptcp: join: reset failing links
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 1/9] Squash to "selftests: mptcp: join: allow running -cCi" Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 2/9] selftests: mptcp: join: define tests groups once Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 4/9] selftests: mptcp: join: option to execute specific tests Matthieu Baerts
` (6 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
Best to always reset this env var before each test to avoid surprising
behaviour depending on the order tests are running.
Also clearly set it for the last failing links test is also needed when
only this test is executed.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 747dd6d887ea..6e84750ce3ae 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -23,6 +23,8 @@ declare -A all_tests
TEST_COUNT=0
nr_blank=40
+export FAILING_LINKS=""
+
# generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) == 0x30) ||
# (ip6 && (ip6[74] & 0xf0) == 0x30)'"
CBPF_MPTCP_SUBOPTION_ADD_ADDR="14,
@@ -63,6 +65,7 @@ init_partial()
done
check_invert=0
+ FAILING_LINKS=""
# ns1 ns2
# ns1eth1 ns2eth1
@@ -1411,7 +1414,7 @@ link_failure_tests()
pm_nl_set_limits $ns1 0 2
pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
pm_nl_set_limits $ns2 1 2
- export FAILING_LINKS="1"
+ FAILING_LINKS="1"
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
run_tests $ns1 $ns2 10.0.1.1 1
chk_join_nr "backup subflow unused, link failure" 2 2 2
@@ -1426,7 +1429,7 @@ link_failure_tests()
pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
- export FAILING_LINKS="1 2"
+ FAILING_LINKS="1 2"
run_tests $ns1 $ns2 10.0.1.1 1
chk_join_nr "backup flow used, multi links fail" 2 2 2
chk_add_nr 1 1
@@ -1441,6 +1444,7 @@ link_failure_tests()
pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
+ FAILING_LINKS="1 2"
run_tests $ns1 $ns2 10.0.1.1 2
chk_join_nr "backup flow used, bidi, link failure" 2 2 2
chk_add_nr 1 1
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH mptcp-next v2 4/9] selftests: mptcp: join: option to execute specific tests
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
` (2 preceding siblings ...)
2022-02-17 17:43 ` [PATCH mptcp-next v2 3/9] selftests: mptcp: join: reset failing links Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 5/9] selftests: mptcp: join: alt. to exec " Matthieu Baerts
` (5 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts, Paolo Abeni
Often, it is needed to run one specific test.
There are options to run subgroups of tests but when only one fails, no
need to run all the subgroup. So far, the solution was to edit the
script to comment the tests that are not needed but that's not ideal.
Now, it is possible to run one specific test by giving the ID of the
tests that are going to be validated, e.g.
./mptcp_join.sh 36 37
This is cleaner and saves time.
Technically, the reset* functions now return 0 if the test can be
executed. This naturally creates sections per test in the code which is
also helpful to understand what a test is exactly doing.
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 1681 +++++++++--------
1 file changed, 905 insertions(+), 776 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 6e84750ce3ae..6b43aa37c370 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -20,6 +20,7 @@ check_invert=0
init=0
declare -A all_tests
+declare -a only_tests
TEST_COUNT=0
nr_blank=40
@@ -149,8 +150,30 @@ cleanup()
cleanup_partial
}
+skip_test()
+{
+ if [ "${#only_tests[@]}" -eq 0 ]; then
+ return 1
+ fi
+
+ local i
+ for i in "${only_tests[@]}"; do
+ if [ "${TEST_COUNT}" -eq "${i}" ]; then
+ return 1
+ fi
+ done
+
+ return 0
+}
+
reset()
{
+ TEST_COUNT=$((TEST_COUNT+1))
+
+ if skip_test; then
+ return 1
+ fi
+
if [ "${init}" != "1" ]; then
init
else
@@ -158,11 +181,13 @@ reset()
fi
init_partial
+
+ return 0
}
reset_with_cookies()
{
- reset
+ reset || return 1
for netns in "$ns1" "$ns2";do
ip netns exec $netns sysctl -q net.ipv4.tcp_syncookies=2
@@ -179,7 +204,7 @@ reset_with_add_addr_timeout()
tables="ip6tables"
fi
- reset
+ reset || return 1
ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
ip netns exec $ns2 $tables -A OUTPUT -p tcp \
@@ -194,7 +219,7 @@ reset_with_checksum()
local ns1_enable=$1
local ns2_enable=$2
- reset
+ reset || 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
@@ -205,7 +230,7 @@ reset_with_allow_join_id0()
local ns1_enable=$1
local ns2_enable=$2
- reset
+ reset || return 1
ip netns exec $ns1 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns1_enable
ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns2_enable
@@ -429,8 +454,7 @@ do_transfer()
speed="$9"
sflags="${10}"
- port=$((10000+$TEST_COUNT))
- TEST_COUNT=$((TEST_COUNT+1))
+ port=$((10000+$TEST_COUNT-1))
:> "$cout"
:> "$sout"
@@ -1173,889 +1197,968 @@ wait_attempt_fail()
subflows_tests()
{
- reset
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "no JOIN" "0" "0" "0"
+ if reset; then
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "no JOIN" 0 0 0
+ fi
# subflow limited by client
- reset
- pm_nl_set_limits $ns1 0 0
- pm_nl_set_limits $ns2 0 0
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow, limited by client" 0 0 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 0
+ pm_nl_set_limits $ns2 0 0
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow, limited by client" 0 0 0
+ fi
# subflow limited by server
- reset
- pm_nl_set_limits $ns1 0 0
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow, limited by server" 1 1 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 0
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow, limited by server" 1 1 0
+ fi
# subflow
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow" 1 1 1
+ fi
# multiple subflows
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 0 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows" 2 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 0 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "multiple subflows" 2 2 2
+ fi
# multiple subflows limited by server
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows, limited by server" 2 2 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "multiple subflows, limited by server" 2 2 1
+ fi
# single subflow, dev
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow dev ns2eth3
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow, dev" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow dev ns2eth3
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow, dev" 1 1 1
+ fi
}
subflows_error_tests()
{
# If a single subflow is configured, and matches the MPC src
# address, no additional subflow should be created
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "no MPC reuse with single endpoint" 0 0 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
+ chk_join_nr "no MPC reuse with single endpoint" 0 0 0
+ fi
# multiple subflows, with subflow creation error
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 0 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "multi subflows, with failing subflow" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 0 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
+ chk_join_nr "multi subflows, with failing subflow" 1 1 1
+ fi
# multiple subflows, with subflow timeout on MPJ
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 0 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "multi subflows, with subflow timeout" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 0 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
+ chk_join_nr "multi subflows, with subflow timeout" 1 1 1
+ fi
# multiple subflows, check that the endpoint corresponding to
# closed subflow (due to reset) is not reused if additional
# subflows are added later
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow &
-
- # updates in the child shell do not have any effect here, we
- # need to bump the test counter for the above case
- TEST_COUNT=$((TEST_COUNT+1))
-
- # mpj subflow will be in TW after the reset
- wait_attempt_fail $ns2
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- wait
-
- # additional subflow could be created only if the PM select
- # the later endpoint, skipping the already used one
- chk_join_nr "multi subflows, fair usage on close" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow &
+
+ # mpj subflow will be in TW after the reset
+ wait_attempt_fail $ns2
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ wait
+
+ # additional subflow could be created only if the PM select
+ # the later endpoint, skipping the already used one
+ chk_join_nr "multi subflows, fair usage on close" 1 1 1
+ fi
}
signal_address_tests()
{
# add_address, unused
- reset
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "unused signal address" 0 0 0
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "unused signal address" 0 0 0
+ chk_add_nr 1 1
+ fi
# accept and use add_addr
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address" 1 1 1
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal address" 1 1 1
+ chk_add_nr 1 1
+ fi
# accept and use add_addr with an additional subflow
# note: signal address in server ns and local addresses in client ns must
# belong to different subnets or one of the listed local address could be
# used for 'add_addr' subflow
- reset
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 1 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and signal" 2 2 2
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 1 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "subflow and signal" 2 2 2
+ chk_add_nr 1 1
+ fi
# accept and use add_addr with additional subflows
- reset
- pm_nl_set_limits $ns1 0 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows and signal" 3 3 3
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "multiple subflows and signal" 3 3 3
+ chk_add_nr 1 1
+ fi
# signal addresses
- reset
- pm_nl_set_limits $ns1 3 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
- pm_nl_set_limits $ns2 3 3
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal addresses" 3 3 3
- chk_add_nr 3 3
+ if reset; then
+ pm_nl_set_limits $ns1 3 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
+ pm_nl_set_limits $ns2 3 3
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal addresses" 3 3 3
+ chk_add_nr 3 3
+ fi
# signal invalid addresses
- reset
- pm_nl_set_limits $ns1 3 3
- pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
- pm_nl_set_limits $ns2 3 3
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal invalid addresses" 1 1 1
- chk_add_nr 3 3
+ if reset; then
+ pm_nl_set_limits $ns1 3 3
+ pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
+ pm_nl_set_limits $ns2 3 3
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal invalid addresses" 1 1 1
+ chk_add_nr 3 3
+ fi
# signal addresses race test
- reset
-
- pm_nl_set_limits $ns1 4 4
- pm_nl_set_limits $ns2 4 4
- pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
- pm_nl_add_endpoint $ns2 10.0.1.2 flags signal
- pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
- pm_nl_add_endpoint $ns2 10.0.3.2 flags signal
- pm_nl_add_endpoint $ns2 10.0.4.2 flags signal
-
- # the peer could possibly miss some addr notification, allow retransmission
- ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "signal addresses race test" 3 3 3
-
- # the server will not signal the address terminating
- # the MPC subflow
- chk_add_nr 3 3
+ if reset; then
+ pm_nl_set_limits $ns1 4 4
+ pm_nl_set_limits $ns2 4 4
+ pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
+ pm_nl_add_endpoint $ns2 10.0.1.2 flags signal
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags signal
+ pm_nl_add_endpoint $ns2 10.0.4.2 flags signal
+
+ # the peer could possibly miss some addr notification, allow retransmission
+ ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
+ chk_join_nr "signal addresses race test" 3 3 3
+
+ # the server will not signal the address terminating
+ # the MPC subflow
+ chk_add_nr 3 3
+ fi
}
link_failure_tests()
{
# accept and use add_addr with additional subflows and link loss
- reset
-
- # without any b/w limit each veth could spool the packets and get
- # them acked at xmit time, so that the corresponding subflow will
- # have almost always no outstanding pkts, the scheduler will pick
- # always the first subflow and we will have hard time testing
- # active backup and link switch-over.
- # Let's set some arbitrary (low) virtual link limits.
- init_shapers
- pm_nl_set_limits $ns1 0 3
- pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 1
- chk_join_nr "multiple flows, signal, link failure" 3 3 3
- chk_add_nr 1 1
- chk_stale_nr $ns2 1 5 1
+ if reset; then
+ # without any b/w limit each veth could spool the packets and get
+ # them acked at xmit time, so that the corresponding subflow will
+ # have almost always no outstanding pkts, the scheduler will pick
+ # always the first subflow and we will have hard time testing
+ # active backup and link switch-over.
+ # Let's set some arbitrary (low) virtual link limits.
+ init_shapers
+ pm_nl_set_limits $ns1 0 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 1
+ chk_join_nr "multiple flows, signal, link failure" 3 3 3
+ chk_add_nr 1 1
+ chk_stale_nr $ns2 1 5 1
+ fi
# accept and use add_addr with additional subflows and link loss
# for bidirectional transfer
- reset
- init_shapers
- pm_nl_set_limits $ns1 0 3
- pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 2
- chk_join_nr "multi flows, signal, bidi, link fail" 3 3 3
- chk_add_nr 1 1
- chk_stale_nr $ns2 1 -1 1
+ if reset; then
+ init_shapers
+ pm_nl_set_limits $ns1 0 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 2
+ chk_join_nr "multi flows, signal, bidi, link fail" 3 3 3
+ chk_add_nr 1 1
+ chk_stale_nr $ns2 1 -1 1
+ fi
# 2 subflows plus 1 backup subflow with a lossy link, backup
# will never be used
- reset
- init_shapers
- pm_nl_set_limits $ns1 0 2
- pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
- pm_nl_set_limits $ns2 1 2
- FAILING_LINKS="1"
- pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
- run_tests $ns1 $ns2 10.0.1.1 1
- chk_join_nr "backup subflow unused, link failure" 2 2 2
- chk_add_nr 1 1
- chk_link_usage $ns2 ns2eth3 $cinsent 0
+ if reset; then
+ init_shapers
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
+ pm_nl_set_limits $ns2 1 2
+ FAILING_LINKS="1"
+ pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
+ run_tests $ns1 $ns2 10.0.1.1 1
+ chk_join_nr "backup subflow unused, link failure" 2 2 2
+ chk_add_nr 1 1
+ chk_link_usage $ns2 ns2eth3 $cinsent 0
+ fi
# 2 lossy links after half transfer, backup will get half of
# the traffic
- reset
- init_shapers
- pm_nl_set_limits $ns1 0 2
- pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
- pm_nl_set_limits $ns2 1 2
- pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
- FAILING_LINKS="1 2"
- run_tests $ns1 $ns2 10.0.1.1 1
- chk_join_nr "backup flow used, multi links fail" 2 2 2
- chk_add_nr 1 1
- chk_stale_nr $ns2 2 4 2
- chk_link_usage $ns2 ns2eth3 $cinsent 50
+ if reset; then
+ init_shapers
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
+ pm_nl_set_limits $ns2 1 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
+ FAILING_LINKS="1 2"
+ run_tests $ns1 $ns2 10.0.1.1 1
+ chk_join_nr "backup flow used, multi links fail" 2 2 2
+ chk_add_nr 1 1
+ chk_stale_nr $ns2 2 4 2
+ chk_link_usage $ns2 ns2eth3 $cinsent 50
+ fi
# use a backup subflow with the first subflow on a lossy link
# for bidirectional transfer
- reset
- init_shapers
- pm_nl_set_limits $ns1 0 2
- pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
- FAILING_LINKS="1 2"
- run_tests $ns1 $ns2 10.0.1.1 2
- chk_join_nr "backup flow used, bidi, link failure" 2 2 2
- chk_add_nr 1 1
- chk_stale_nr $ns2 1 -1 2
- chk_link_usage $ns2 ns2eth3 $cinsent 50
+ if reset; then
+ init_shapers
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
+ FAILING_LINKS="1 2"
+ run_tests $ns1 $ns2 10.0.1.1 2
+ chk_join_nr "backup flow used, bidi, link failure" 2 2 2
+ chk_add_nr 1 1
+ chk_stale_nr $ns2 1 -1 2
+ chk_link_usage $ns2 ns2eth3 $cinsent 50
+ fi
}
add_addr_timeout_tests()
{
# add_addr timeout
- reset_with_add_addr_timeout
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1
- chk_add_nr 4 0
+ if reset_with_add_addr_timeout; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
+ chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1
+ chk_add_nr 4 0
+ fi
# add_addr timeout IPv6
- reset_with_add_addr_timeout 6
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
- run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1
- chk_add_nr 4 0
+ if reset_with_add_addr_timeout 6; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
+ run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
+ chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1
+ chk_add_nr 4 0
+ fi
# signal addresses timeout
- reset_with_add_addr_timeout
- pm_nl_set_limits $ns1 2 2
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_set_limits $ns2 2 2
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
- chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2
- chk_add_nr 8 0
+ if reset_with_add_addr_timeout; then
+ pm_nl_set_limits $ns1 2 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_set_limits $ns2 2 2
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
+ chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2
+ chk_add_nr 8 0
+ fi
# signal invalid addresses timeout
- reset_with_add_addr_timeout
- pm_nl_set_limits $ns1 2 2
- pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_set_limits $ns2 2 2
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
- chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1
- chk_add_nr 8 0
+ if reset_with_add_addr_timeout; then
+ pm_nl_set_limits $ns1 2 2
+ pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_set_limits $ns2 2 2
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
+ chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1
+ chk_add_nr 8 0
+ fi
}
remove_tests()
{
# single subflow, remove
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
- chk_join_nr "remove single subflow" 1 1 1
- chk_rm_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
+ chk_join_nr "remove single subflow" 1 1 1
+ chk_rm_nr 1 1
+ fi
# multiple subflows, remove
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 0 2
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow
- chk_join_nr "remove multiple subflows" 2 2 2
- chk_rm_nr 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 0 2
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow
+ chk_join_nr "remove multiple subflows" 2 2 2
+ chk_rm_nr 2 2
+ fi
# single address, remove
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
- chk_join_nr "remove single address" 1 1 1
- chk_add_nr 1 1
- chk_rm_nr 1 1 invert
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
+ chk_join_nr "remove single address" 1 1 1
+ chk_add_nr 1 1
+ chk_rm_nr 1 1 invert
+ fi
# subflow and signal, remove
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
- chk_join_nr "remove subflow and signal" 2 2 2
- chk_add_nr 1 1
- chk_rm_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
+ chk_join_nr "remove subflow and signal" 2 2 2
+ chk_add_nr 1 1
+ chk_rm_nr 1 1
+ fi
# subflows and signal, remove
- reset
- pm_nl_set_limits $ns1 0 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow
- chk_join_nr "remove subflows and signal" 3 3 3
- chk_add_nr 1 1
- chk_rm_nr 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow
+ chk_join_nr "remove subflows and signal" 3 3 3
+ chk_add_nr 1 1
+ chk_rm_nr 2 2
+ fi
# addresses remove
- reset
- pm_nl_set_limits $ns1 3 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
- pm_nl_set_limits $ns2 3 3
- run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
- chk_join_nr "remove addresses" 3 3 3
- chk_add_nr 3 3
- chk_rm_nr 3 3 invert
+ if reset; then
+ pm_nl_set_limits $ns1 3 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
+ pm_nl_set_limits $ns2 3 3
+ run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
+ chk_join_nr "remove addresses" 3 3 3
+ chk_add_nr 3 3
+ chk_rm_nr 3 3 invert
+ fi
# invalid addresses remove
- reset
- pm_nl_set_limits $ns1 3 3
- pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
- pm_nl_set_limits $ns2 3 3
- run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
- chk_join_nr "remove invalid addresses" 1 1 1
- chk_add_nr 3 3
- chk_rm_nr 3 1 invert
+ if reset; then
+ pm_nl_set_limits $ns1 3 3
+ pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
+ pm_nl_set_limits $ns2 3 3
+ run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
+ chk_join_nr "remove invalid addresses" 1 1 1
+ chk_add_nr 3 3
+ chk_rm_nr 3 1 invert
+ fi
# subflows and signal, flush
- reset
- pm_nl_set_limits $ns1 0 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
- chk_join_nr "flush subflows and signal" 3 3 3
- chk_add_nr 1 1
- chk_rm_nr 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
+ chk_join_nr "flush subflows and signal" 3 3 3
+ chk_add_nr 1 1
+ chk_rm_nr 2 2
+ fi
# subflows flush
- reset
- pm_nl_set_limits $ns1 3 3
- pm_nl_set_limits $ns2 3 3
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
- chk_join_nr "flush subflows" 3 3 3
- chk_rm_nr 3 3
+ if reset; then
+ pm_nl_set_limits $ns1 3 3
+ pm_nl_set_limits $ns2 3 3
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
+ chk_join_nr "flush subflows" 3 3 3
+ chk_rm_nr 3 3
+ fi
# addresses flush
- reset
- pm_nl_set_limits $ns1 3 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
- pm_nl_set_limits $ns2 3 3
- run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
- chk_join_nr "flush addresses" 3 3 3
- chk_add_nr 3 3
- chk_rm_nr 3 3 invert
+ if reset; then
+ pm_nl_set_limits $ns1 3 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
+ pm_nl_set_limits $ns2 3 3
+ run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
+ chk_join_nr "flush addresses" 3 3 3
+ chk_add_nr 3 3
+ chk_rm_nr 3 3 invert
+ fi
# invalid addresses flush
- reset
- pm_nl_set_limits $ns1 3 3
- pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
- pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
- pm_nl_set_limits $ns2 3 3
- run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow
- chk_join_nr "flush invalid addresses" 1 1 1
- chk_add_nr 3 3
- chk_rm_nr 3 1 invert
+ if reset; then
+ pm_nl_set_limits $ns1 3 3
+ pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
+ pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
+ pm_nl_set_limits $ns2 3 3
+ run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow
+ chk_join_nr "flush invalid addresses" 1 1 1
+ chk_add_nr 3 3
+ chk_rm_nr 3 1 invert
+ fi
# remove id 0 subflow
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow
- chk_join_nr "remove id 0 subflow" 1 1 1
- chk_rm_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow
+ chk_join_nr "remove id 0 subflow" 1 1 1
+ chk_rm_nr 1 1
+ fi
# remove id 0 address
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow
- chk_join_nr "remove id 0 address" 1 1 1
- chk_add_nr 1 1
- chk_rm_nr 1 1 invert
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow
+ chk_join_nr "remove id 0 address" 1 1 1
+ chk_add_nr 1 1
+ chk_rm_nr 1 1 invert
+ fi
}
add_tests()
{
# add single subflow
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
- chk_join_nr "add single subflow" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
+ chk_join_nr "add single subflow" 1 1 1
+ fi
# add signal address
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
- chk_join_nr "add signal address" 1 1 1
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
+ chk_join_nr "add signal address" 1 1 1
+ chk_add_nr 1 1
+ fi
# add multiple subflows
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 0 2
- run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
- chk_join_nr "add multiple subflows" 2 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 0 2
+ run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
+ chk_join_nr "add multiple subflows" 2 2 2
+ fi
# add multiple subflows IPv6
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 0 2
- run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
- chk_join_nr "add multiple subflows IPv6" 2 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 0 2
+ run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
+ chk_join_nr "add multiple subflows IPv6" 2 2 2
+ fi
# add multiple addresses IPv6
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 2 2
- run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow
- chk_join_nr "add multiple addresses IPv6" 2 2 2
- chk_add_nr 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 2 2
+ run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow
+ chk_join_nr "add multiple addresses IPv6" 2 2 2
+ chk_add_nr 2 2
+ fi
}
ipv6_tests()
{
# subflow IPv6
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
- run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "single subflow IPv6" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
+ run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
+ chk_join_nr "single subflow IPv6" 1 1 1
+ fi
# add_address, unused IPv6
- reset
- pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
- run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "unused signal address IPv6" 0 0 0
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
+ run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
+ chk_join_nr "unused signal address IPv6" 0 0 0
+ chk_add_nr 1 1
+ fi
# signal address IPv6
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "single address IPv6" 1 1 1
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
+ chk_join_nr "single address IPv6" 1 1 1
+ chk_add_nr 1 1
+ fi
# single address IPv6, remove
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow
- chk_join_nr "remove single address IPv6" 1 1 1
- chk_add_nr 1 1
- chk_rm_nr 1 1 invert
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow
+ chk_join_nr "remove single address IPv6" 1 1 1
+ chk_add_nr 1 1
+ chk_rm_nr 1 1 invert
+ fi
# subflow and signal IPv6, remove
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
- pm_nl_set_limits $ns2 1 2
- pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
- run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow
- chk_join_nr "remove subflow and signal IPv6" 2 2 2
- chk_add_nr 1 1
- chk_rm_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
+ pm_nl_set_limits $ns2 1 2
+ pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
+ run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow
+ chk_join_nr "remove subflow and signal IPv6" 2 2 2
+ chk_add_nr 1 1
+ chk_rm_nr 1 1
+ fi
}
v4mapped_tests()
{
# subflow IPv4-mapped to IPv4-mapped
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
- run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "single subflow IPv4-mapped" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
+ run_tests $ns1 $ns2 "::ffff:10.0.1.1"
+ chk_join_nr "single subflow IPv4-mapped" 1 1 1
+ fi
# signal address IPv4-mapped with IPv4-mapped sk
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
- run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "signal address IPv4-mapped" 1 1 1
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
+ run_tests $ns1 $ns2 "::ffff:10.0.1.1"
+ chk_join_nr "signal address IPv4-mapped" 1 1 1
+ chk_add_nr 1 1
+ fi
# subflow v4-map-v6
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "single subflow v4-map-v6" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 "::ffff:10.0.1.1"
+ chk_join_nr "single subflow v4-map-v6" 1 1 1
+ fi
# signal address v4-map-v6
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "signal address v4-map-v6" 1 1 1
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 "::ffff:10.0.1.1"
+ chk_join_nr "signal address v4-map-v6" 1 1 1
+ chk_add_nr 1 1
+ fi
# subflow v6-map-v4
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow v6-map-v4" 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow v6-map-v4" 1 1 1
+ fi
# signal address v6-map-v4
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address v6-map-v4" 1 1 1
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal address v6-map-v4" 1 1 1
+ chk_add_nr 1 1
+ fi
# no subflow IPv6 to v4 address
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "no JOIN with diff families v4-v6" 0 0 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "no JOIN with diff families v4-v6" 0 0 0
+ fi
# no subflow IPv6 to v4 address even if v6 has a valid v4 at the end
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 dead:beef:2::10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "no JOIN with diff families v4-v6-2" 0 0 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 dead:beef:2::10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "no JOIN with diff families v4-v6-2" 0 0 0
+ fi
# no subflow IPv4 to v6 address, no need to slow down too then
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 dead:beef:1::1
- chk_join_nr "no JOIN with diff families v6-v4" 0 0 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 dead:beef:1::1
+ chk_join_nr "no JOIN with diff families v6-v4" 0 0 0
+ fi
}
backup_tests()
{
# single subflow, backup
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup
- chk_join_nr "single subflow, backup" 1 1 1
- chk_prio_nr 0 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup
+ chk_join_nr "single subflow, backup" 1 1 1
+ chk_prio_nr 0 1
+ fi
# single address, backup
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
- chk_join_nr "single address, backup" 1 1 1
- chk_add_nr 1 1
- chk_prio_nr 1 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
+ chk_join_nr "single address, backup" 1 1 1
+ chk_add_nr 1 1
+ chk_prio_nr 1 0
+ fi
# single address with port, backup
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
- chk_join_nr "single address with port, backup" 1 1 1
- chk_add_nr 1 1
- chk_prio_nr 1 0
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
+ chk_join_nr "single address with port, backup" 1 1 1
+ chk_add_nr 1 1
+ chk_prio_nr 1 0
+ fi
}
add_addr_ports_tests()
{
# signal address with port
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address with port" 1 1 1
- chk_add_nr 1 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal address with port" 1 1 1
+ chk_add_nr 1 1 1
+ fi
# subflow and signal with port
- reset
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 1 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and signal with port" 2 2 2
- chk_add_nr 1 1 1
+ if reset; then
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 1 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "subflow and signal with port" 2 2 2
+ chk_add_nr 1 1 1
+ fi
# single address with port, remove
- reset
- pm_nl_set_limits $ns1 0 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- pm_nl_set_limits $ns2 1 1
- run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
- chk_join_nr "remove single address with port" 1 1 1
- chk_add_nr 1 1 1
- chk_rm_nr 1 1 invert
+ if reset; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ pm_nl_set_limits $ns2 1 1
+ run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
+ chk_join_nr "remove single address with port" 1 1 1
+ chk_add_nr 1 1 1
+ chk_rm_nr 1 1 invert
+ fi
# subflow and signal with port, remove
- reset
- pm_nl_set_limits $ns1 0 2
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- pm_nl_set_limits $ns2 1 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
- chk_join_nr "remove subflow and signal with port" 2 2 2
- chk_add_nr 1 1 1
- chk_rm_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ pm_nl_set_limits $ns2 1 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
+ chk_join_nr "remove subflow and signal with port" 2 2 2
+ chk_add_nr 1 1 1
+ chk_rm_nr 1 1
+ fi
# subflows and signal with port, flush
- reset
- pm_nl_set_limits $ns1 0 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow
- chk_join_nr "flush subflows and signal with port" 3 3 3
- chk_add_nr 1 1
- chk_rm_nr 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 0 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow
+ chk_join_nr "flush subflows and signal with port" 3 3 3
+ chk_add_nr 1 1
+ chk_rm_nr 2 2
+ fi
# multiple addresses with port
- reset
- pm_nl_set_limits $ns1 2 2
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10100
- pm_nl_set_limits $ns2 2 2
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple addresses with port" 2 2 2
- chk_add_nr 2 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 2 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10100
+ pm_nl_set_limits $ns2 2 2
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "multiple addresses with port" 2 2 2
+ chk_add_nr 2 2 2
+ fi
# multiple addresses with ports
- reset
- pm_nl_set_limits $ns1 2 2
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
- pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10101
- pm_nl_set_limits $ns2 2 2
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple addresses with ports" 2 2 2
- chk_add_nr 2 2 2
+ if reset; then
+ pm_nl_set_limits $ns1 2 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
+ pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10101
+ pm_nl_set_limits $ns2 2 2
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "multiple addresses with ports" 2 2 2
+ chk_add_nr 2 2 2
+ fi
}
syncookies_tests()
{
# single subflow, syncookies
- reset_with_cookies
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow with syn cookies" 1 1 1
+ if reset_with_cookies; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow with syn cookies" 1 1 1
+ fi
# multiple subflows with syn cookies
- reset_with_cookies
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 0 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows with syn cookies" 2 2 2
+ if reset_with_cookies; then
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 0 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "multiple subflows with syn cookies" 2 2 2
+ fi
# multiple subflows limited by server
- reset_with_cookies
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflows limited by server w cookies" 2 1 1
+ if reset_with_cookies; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 0 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "subflows limited by server w cookies" 2 1 1
+ fi
# test signal address with cookies
- reset_with_cookies
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address with syn cookies" 1 1 1
- chk_add_nr 1 1
+ if reset_with_cookies; then
+ pm_nl_set_limits $ns1 0 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal address with syn cookies" 1 1 1
+ chk_add_nr 1 1
+ fi
# test cookie with subflow and signal
- reset_with_cookies
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns1 0 2
- pm_nl_set_limits $ns2 1 2
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and signal w cookies" 2 2 2
- chk_add_nr 1 1
+ if reset_with_cookies; then
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns1 0 2
+ pm_nl_set_limits $ns2 1 2
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "subflow and signal w cookies" 2 2 2
+ chk_add_nr 1 1
+ fi
# accept and use add_addr with additional subflows
- reset_with_cookies
- pm_nl_set_limits $ns1 0 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflows and signal w. cookies" 3 3 3
- chk_add_nr 1 1
+ if reset_with_cookies; then
+ pm_nl_set_limits $ns1 0 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "subflows and signal w. cookies" 3 3 3
+ chk_add_nr 1 1
+ fi
}
checksum_tests()
{
# checksum test 0 0
- reset_with_checksum 0 0
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "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_csum_nr "checksum test 0 0"
+ fi
# checksum test 1 1
- reset_with_checksum 1 1
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "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_csum_nr "checksum test 1 1"
+ fi
# checksum test 0 1
- reset_with_checksum 0 1
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "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_csum_nr "checksum test 0 1"
+ fi
# checksum test 1 0
- reset_with_checksum 1 0
- pm_nl_set_limits $ns1 0 1
- pm_nl_set_limits $ns2 0 1
- run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "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_csum_nr "checksum test 1 0"
+ fi
}
deny_join_id0_tests()
{
# subflow allow join id0 ns1
- reset_with_allow_join_id0 1 0
- pm_nl_set_limits $ns1 1 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow allow join id0 ns1" 1 1 1
+ if reset_with_allow_join_id0 1 0; then
+ pm_nl_set_limits $ns1 1 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow allow join id0 ns1" 1 1 1
+ fi
# subflow allow join id0 ns2
- reset_with_allow_join_id0 0 1
- pm_nl_set_limits $ns1 1 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow allow join id0 ns2" 0 0 0
+ if reset_with_allow_join_id0 0 1; then
+ pm_nl_set_limits $ns1 1 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "single subflow allow join id0 ns2" 0 0 0
+ fi
# signal address allow join id0 ns1
# ADD_ADDRs are not affected by allow_join_id0 value.
- reset_with_allow_join_id0 1 0
- pm_nl_set_limits $ns1 1 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address allow join id0 ns1" 1 1 1
- chk_add_nr 1 1
+ if reset_with_allow_join_id0 1 0; then
+ pm_nl_set_limits $ns1 1 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal address allow join id0 ns1" 1 1 1
+ chk_add_nr 1 1
+ fi
# signal address allow join id0 ns2
# ADD_ADDRs are not affected by allow_join_id0 value.
- reset_with_allow_join_id0 0 1
- pm_nl_set_limits $ns1 1 1
- pm_nl_set_limits $ns2 1 1
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address allow join id0 ns2" 1 1 1
- chk_add_nr 1 1
+ if reset_with_allow_join_id0 0 1; then
+ pm_nl_set_limits $ns1 1 1
+ pm_nl_set_limits $ns2 1 1
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "signal address allow join id0 ns2" 1 1 1
+ chk_add_nr 1 1
+ fi
# subflow and address allow join id0 ns1
- reset_with_allow_join_id0 1 0
- pm_nl_set_limits $ns1 2 2
- pm_nl_set_limits $ns2 2 2
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and address allow join id0 1" 2 2 2
+ if reset_with_allow_join_id0 1 0; then
+ pm_nl_set_limits $ns1 2 2
+ pm_nl_set_limits $ns2 2 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "subflow and address allow join id0 1" 2 2 2
+ fi
# subflow and address allow join id0 ns2
- reset_with_allow_join_id0 0 1
- pm_nl_set_limits $ns1 2 2
- pm_nl_set_limits $ns2 2 2
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and address allow join id0 2" 1 1 1
+ if reset_with_allow_join_id0 0 1; then
+ pm_nl_set_limits $ns1 2 2
+ pm_nl_set_limits $ns2 2 2
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "subflow and address allow join id0 2" 1 1 1
+ fi
}
fullmesh_tests()
@@ -2063,148 +2166,162 @@ fullmesh_tests()
# fullmesh 1
# 2 fullmesh addrs in ns2, added before the connection,
# 1 non-fullmesh addr in ns1, added during the connection.
- reset
- pm_nl_set_limits $ns1 0 4
- pm_nl_set_limits $ns2 1 4
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh
- pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh
- run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
- chk_join_nr "fullmesh test 2x1" 4 4 4
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 0 4
+ pm_nl_set_limits $ns2 1 4
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh
+ pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh
+ run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
+ chk_join_nr "fullmesh test 2x1" 4 4 4
+ chk_add_nr 1 1
+ fi
# fullmesh 2
# 1 non-fullmesh addr in ns1, added before the connection,
# 1 fullmesh addr in ns2, added during the connection.
- reset
- pm_nl_set_limits $ns1 1 3
- pm_nl_set_limits $ns2 1 3
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow
- chk_join_nr "fullmesh test 1x1" 3 3 3
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 1 3
+ pm_nl_set_limits $ns2 1 3
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow
+ chk_join_nr "fullmesh test 1x1" 3 3 3
+ chk_add_nr 1 1
+ fi
# fullmesh 3
# 1 non-fullmesh addr in ns1, added before the connection,
# 2 fullmesh addrs in ns2, added during the connection.
- reset
- pm_nl_set_limits $ns1 2 5
- pm_nl_set_limits $ns2 1 5
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
- chk_join_nr "fullmesh test 1x2" 5 5 5
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 2 5
+ pm_nl_set_limits $ns2 1 5
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
+ chk_join_nr "fullmesh test 1x2" 5 5 5
+ chk_add_nr 1 1
+ fi
# fullmesh 4
# 1 non-fullmesh addr in ns1, added before the connection,
# 2 fullmesh addrs in ns2, added during the connection,
# limit max_subflows to 4.
- reset
- pm_nl_set_limits $ns1 2 4
- pm_nl_set_limits $ns2 1 4
- pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
- chk_join_nr "fullmesh test 1x2, limited" 4 4 4
- chk_add_nr 1 1
+ if reset; then
+ pm_nl_set_limits $ns1 2 4
+ pm_nl_set_limits $ns2 1 4
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
+ chk_join_nr "fullmesh test 1x2, limited" 4 4 4
+ chk_add_nr 1 1
+ fi
# set fullmesh flag
- reset
- pm_nl_set_limits $ns1 4 4
- pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
- pm_nl_set_limits $ns2 4 4
- run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh
- chk_join_nr "set fullmesh flag test" 2 2 2
- chk_rm_nr 0 1
+ if reset; then
+ pm_nl_set_limits $ns1 4 4
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
+ pm_nl_set_limits $ns2 4 4
+ run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh
+ chk_join_nr "set fullmesh flag test" 2 2 2
+ chk_rm_nr 0 1
+ fi
# set nofullmesh flag
- reset
- pm_nl_set_limits $ns1 4 4
- pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh
- pm_nl_set_limits $ns2 4 4
- run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh
- chk_join_nr "set nofullmesh flag test" 2 2 2
- chk_rm_nr 0 1
+ if reset; then
+ pm_nl_set_limits $ns1 4 4
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh
+ pm_nl_set_limits $ns2 4 4
+ run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh
+ chk_join_nr "set nofullmesh flag test" 2 2 2
+ chk_rm_nr 0 1
+ fi
# set backup,fullmesh flags
- reset
- pm_nl_set_limits $ns1 4 4
- pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
- pm_nl_set_limits $ns2 4 4
- run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow backup,fullmesh
- chk_join_nr "set backup,fullmesh flags test" 2 2 2
- chk_prio_nr 0 1
- chk_rm_nr 0 1
+ if reset; then
+ pm_nl_set_limits $ns1 4 4
+ pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
+ pm_nl_set_limits $ns2 4 4
+ run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow backup,fullmesh
+ chk_join_nr "set backup,fullmesh flags test" 2 2 2
+ chk_prio_nr 0 1
+ chk_rm_nr 0 1
+ fi
# set nobackup,nofullmesh flags
- reset
- pm_nl_set_limits $ns1 4 4
- pm_nl_set_limits $ns2 4 4
- pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup,nofullmesh
- chk_join_nr "set nobackup,nofullmesh flags test" 2 2 2
- chk_prio_nr 0 1
- chk_rm_nr 0 1
+ if reset; then
+ pm_nl_set_limits $ns1 4 4
+ pm_nl_set_limits $ns2 4 4
+ pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup,nofullmesh
+ chk_join_nr "set nobackup,nofullmesh flags test" 2 2 2
+ chk_prio_nr 0 1
+ chk_rm_nr 0 1
+ fi
}
userspace_tests()
{
# userspace pm type prevents add_addr
- reset
- ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
- ip netns exec $ns1 ./pm_nl_ctl limits 0 2
- ip netns exec $ns2 ./pm_nl_ctl limits 0 2
- ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type prevents add_addr" 0 0 0
- chk_add_nr 0 0
+ if reset; then
+ ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
+ ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "userspace pm type prevents add_addr" 0 0 0
+ chk_add_nr 0 0
+ fi
# userspace pm type echoes add_addr
- reset
- ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
- ip netns exec $ns1 ./pm_nl_ctl limits 0 2
- ip netns exec $ns2 ./pm_nl_ctl limits 0 2
- ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type echoes add_addr" 0 0 0
- chk_add_nr 1 1
+ if reset; then
+ ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
+ ip netns exec $ns1 ./pm_nl_ctl limits 0 2
+ ip netns exec $ns2 ./pm_nl_ctl limits 0 2
+ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "userspace pm type echoes add_addr" 0 0 0
+ chk_add_nr 1 1
+ fi
# userspace pm type rejects join
- reset
- ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
- ip netns exec $ns1 ./pm_nl_ctl limits 1 1
- ip netns exec $ns2 ./pm_nl_ctl limits 1 1
- ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type rejects join" 1 1 0
+ if reset; then
+ ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
+ ip netns exec $ns1 ./pm_nl_ctl limits 1 1
+ ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+ ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "userspace pm type rejects join" 1 1 0
+ fi
# userspace pm type does not send join
- reset
- ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
- ip netns exec $ns1 ./pm_nl_ctl limits 1 1
- ip netns exec $ns2 ./pm_nl_ctl limits 1 1
- ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type does not send join" 0 0 0
+ if reset; then
+ ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
+ ip netns exec $ns1 ./pm_nl_ctl limits 1 1
+ ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+ ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1
+ chk_join_nr "userspace pm type does not send join" 0 0 0
+ fi
# userspace pm type prevents mp_prio
- reset
- ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
- ip netns exec $ns1 ./pm_nl_ctl limits 1 1
- ip netns exec $ns2 ./pm_nl_ctl limits 1 1
- ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
- chk_join_nr "userspace pm type prevents mp_prio" 1 1 0
- chk_prio_nr 0 0
+ if reset; then
+ ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
+ ip netns exec $ns1 ./pm_nl_ctl limits 1 1
+ ip netns exec $ns2 ./pm_nl_ctl limits 1 1
+ ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
+ chk_join_nr "userspace pm type prevents mp_prio" 1 1 0
+ chk_prio_nr 0 0
+ fi
# userspace pm type prevents rm_addr
- reset
- ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
- ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
- ip netns exec $ns1 ./pm_nl_ctl limits 0 1
- ip netns exec $ns2 ./pm_nl_ctl limits 0 1
- ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
- run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
- chk_join_nr "userspace pm type prevents rm_addr" 0 0 0
- chk_rm_nr 0 0
+ if reset; then
+ ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
+ ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
+ ip netns exec $ns1 ./pm_nl_ctl limits 0 1
+ ip netns exec $ns2 ./pm_nl_ctl limits 0 1
+ ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
+ run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
+ chk_join_nr "userspace pm type prevents rm_addr" 0 0 0
+ chk_rm_nr 0 0
+ fi
}
# [$1: error message]
@@ -2227,6 +2344,8 @@ usage()
echo " -i use ip mptcp"
echo " -h help"
+ echo "[test ids]"
+
exit ${ret}
}
@@ -2286,6 +2405,16 @@ while getopts "${all_tests_args}cCih" opt; do
esac
done
+shift $((OPTIND - 1))
+
+for arg in "${@}"; do
+ if [[ "${arg}" =~ ^[0-9]+$ ]]; then
+ only_tests+=("${arg}")
+ else
+ usage "Unknown argument: ${arg}"
+ fi
+done
+
if [ ${#tests[@]} -eq 0 ]; then
tests=("${all_tests_names[@]}")
fi
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH mptcp-next v2 5/9] selftests: mptcp: join: alt. to exec specific tests
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
` (3 preceding siblings ...)
2022-02-17 17:43 ` [PATCH mptcp-next v2 4/9] selftests: mptcp: join: option to execute specific tests Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-18 0:35 ` Mat Martineau
2022-02-17 17:43 ` [PATCH mptcp-next v2 6/9] selftests: mptcp: join: list failure at the end Matthieu Baerts
` (4 subsequent siblings)
9 siblings, 1 reply; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
Running a specific test by giving the ID is often what we want: the CI
reports an issue with the Nth test, it is reproduceable with
./mptcp_join.sh N
But this doesn't work when a test is unstable and it is needed to find
since when it is unstable because the ID is a counter and new tests can
be added before changing the ID of a specific test.
Remembering the current test can also help listing failed tests at the
end.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 441 +++++++++---------
1 file changed, 227 insertions(+), 214 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 6b43aa37c370..de701de19219 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -20,8 +20,10 @@ check_invert=0
init=0
declare -A all_tests
-declare -a only_tests
+declare -a only_tests_ids
+declare -a only_tests_names
TEST_COUNT=0
+TEST_NAME=""
nr_blank=40
export FAILING_LINKS=""
@@ -152,22 +154,30 @@ cleanup()
skip_test()
{
- if [ "${#only_tests[@]}" -eq 0 ]; then
+ if [ "${#only_tests_ids[@]}" -eq 0 ] && [ "${#only_tests_names[@]}" -eq 0 ]; then
return 1
fi
local i
- for i in "${only_tests[@]}"; do
+ for i in "${only_tests_ids[@]}"; do
if [ "${TEST_COUNT}" -eq "${i}" ]; then
return 1
fi
done
+ for i in "${only_tests_names[@]}"; do
+ if [ "${TEST_NAME}" = "${i}" ]; then
+ return 1
+ fi
+ done
return 0
}
+# $1: test name
reset()
{
+ TEST_NAME="${1}"
+
TEST_COUNT=$((TEST_COUNT+1))
if skip_test; then
@@ -185,27 +195,29 @@ reset()
return 0
}
+# $1: test name
reset_with_cookies()
{
- reset || return 1
+ reset "${1}" || return 1
for netns in "$ns1" "$ns2";do
ip netns exec $netns sysctl -q net.ipv4.tcp_syncookies=2
done
}
+# $1: test name
reset_with_add_addr_timeout()
{
- local ip="${1:-4}"
+ local ip="${2:-4}"
local tables
+ reset "${1}" || return 1
+
tables="iptables"
if [ $ip -eq 6 ]; then
tables="ip6tables"
fi
- reset || return 1
-
ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
ip netns exec $ns2 $tables -A OUTPUT -p tcp \
-m tcp --tcp-option 30 \
@@ -214,12 +226,13 @@ reset_with_add_addr_timeout()
-j DROP
}
+# $1: test name
reset_with_checksum()
{
local ns1_enable=$1
local ns2_enable=$2
- reset || return 1
+ reset "checksum test ${1} ${2}" || 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
@@ -227,10 +240,10 @@ reset_with_checksum()
reset_with_allow_join_id0()
{
- local ns1_enable=$1
- local ns2_enable=$2
+ local ns1_enable=$2
+ local ns2_enable=$3
- reset || return 1
+ reset "${1}" || return 1
ip netns exec $ns1 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns1_enable
ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns2_enable
@@ -769,8 +782,9 @@ chk_csum_nr()
local count
local dump_stats
- if [ ! -z "$msg" ]; then
+ if [ "${msg}" = 1 ]; then
printf "%03u" "$TEST_COUNT"
+ msg="${TEST_TITLE}"
else
echo -n " "
fi
@@ -863,15 +877,14 @@ chk_infi_nr()
chk_join_nr()
{
- local msg="$1"
- local syn_nr=$2
- local syn_ack_nr=$3
- local ack_nr=$4
+ local syn_nr=$1
+ local syn_ack_nr=$2
+ local ack_nr=$3
local count
local dump_stats
local with_cookie
- printf "%03u %-36s %s" "$TEST_COUNT" "$msg" "syn"
+ printf "%03u %-36s %s" "${TEST_COUNT}" "${TEST_NAME}" "syn"
count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinSynRx | awk '{print $2}'`
[ -z "$count" ] && count=0
if [ "$count" != "$syn_nr" ]; then
@@ -1197,65 +1210,65 @@ wait_attempt_fail()
subflows_tests()
{
- if reset; then
+ if reset "no JOIN"; then
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "no JOIN" 0 0 0
+ chk_join_nr 0 0 0
fi
# subflow limited by client
- if reset; then
+ if reset "single subflow, limited by client"; then
pm_nl_set_limits $ns1 0 0
pm_nl_set_limits $ns2 0 0
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow, limited by client" 0 0 0
+ chk_join_nr 0 0 0
fi
# subflow limited by server
- if reset; then
+ if reset "single subflow, limited by server"; then
pm_nl_set_limits $ns1 0 0
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow, limited by server" 1 1 0
+ chk_join_nr 1 1 0
fi
# subflow
- if reset; then
+ if reset "single subflow"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow" 1 1 1
+ chk_join_nr 1 1 1
fi
# multiple subflows
- if reset; then
+ if reset "multiple subflows"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows" 2 2 2
+ chk_join_nr 2 2 2
fi
# multiple subflows limited by server
- if reset; then
+ if reset "multiple subflows, limited by server"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows, limited by server" 2 2 1
+ chk_join_nr 2 2 1
fi
# single subflow, dev
- if reset; then
+ if reset "single subflow, dev"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow dev ns2eth3
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow, dev" 1 1 1
+ chk_join_nr 1 1 1
fi
}
@@ -1263,40 +1276,40 @@ subflows_error_tests()
{
# If a single subflow is configured, and matches the MPC src
# address, no additional subflow should be created
- if reset; then
+ if reset "no MPC reuse with single endpoint"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "no MPC reuse with single endpoint" 0 0 0
+ chk_join_nr 0 0 0
fi
# multiple subflows, with subflow creation error
- if reset; then
+ if reset "multi subflows, with failing subflow"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "multi subflows, with failing subflow" 1 1 1
+ chk_join_nr 1 1 1
fi
# multiple subflows, with subflow timeout on MPJ
- if reset; then
+ if reset "multi subflows, with subflow timeout"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "multi subflows, with subflow timeout" 1 1 1
+ chk_join_nr 1 1 1
fi
# multiple subflows, check that the endpoint corresponding to
# closed subflow (due to reset) is not reused if additional
# subflows are added later
- if reset; then
+ if reset "multi subflows, fair usage on close"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
@@ -1310,27 +1323,27 @@ subflows_error_tests()
# additional subflow could be created only if the PM select
# the later endpoint, skipping the already used one
- chk_join_nr "multi subflows, fair usage on close" 1 1 1
+ chk_join_nr 1 1 1
fi
}
signal_address_tests()
{
# add_address, unused
- if reset; then
+ if reset "unused signal address"; then
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "unused signal address" 0 0 0
+ chk_join_nr 0 0 0
chk_add_nr 1 1
fi
# accept and use add_addr
- if reset; then
+ if reset "signal address"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
@@ -1338,54 +1351,54 @@ signal_address_tests()
# note: signal address in server ns and local addresses in client ns must
# belong to different subnets or one of the listed local address could be
# used for 'add_addr' subflow
- if reset; then
+ if reset "subflow and signal"; then
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and signal" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1
fi
# accept and use add_addr with additional subflows
- if reset; then
+ if reset "multiple subflows and signal"; then
pm_nl_set_limits $ns1 0 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows and signal" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
fi
# signal addresses
- if reset; then
+ if reset "signal addresses"; then
pm_nl_set_limits $ns1 3 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
pm_nl_set_limits $ns2 3 3
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal addresses" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 3 3
fi
# signal invalid addresses
- if reset; then
+ if reset "signal invalid addresses"; then
pm_nl_set_limits $ns1 3 3
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
pm_nl_set_limits $ns2 3 3
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal invalid addresses" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 3 3
fi
# signal addresses race test
- if reset; then
+ if reset "signal addresses race test"; then
pm_nl_set_limits $ns1 4 4
pm_nl_set_limits $ns2 4 4
pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
@@ -1400,7 +1413,7 @@ signal_address_tests()
# the peer could possibly miss some addr notification, allow retransmission
ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "signal addresses race test" 3 3 3
+ chk_join_nr 3 3 3
# the server will not signal the address terminating
# the MPC subflow
@@ -1411,7 +1424,7 @@ signal_address_tests()
link_failure_tests()
{
# accept and use add_addr with additional subflows and link loss
- if reset; then
+ if reset "multiple flows, signal, link failure"; then
# without any b/w limit each veth could spool the packets and get
# them acked at xmit time, so that the corresponding subflow will
# have almost always no outstanding pkts, the scheduler will pick
@@ -1425,14 +1438,14 @@ link_failure_tests()
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
run_tests $ns1 $ns2 10.0.1.1 1
- chk_join_nr "multiple flows, signal, link failure" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
chk_stale_nr $ns2 1 5 1
fi
# accept and use add_addr with additional subflows and link loss
# for bidirectional transfer
- if reset; then
+ if reset "multi flows, signal, bidi, link fail"; then
init_shapers
pm_nl_set_limits $ns1 0 3
pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
@@ -1440,14 +1453,14 @@ link_failure_tests()
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
run_tests $ns1 $ns2 10.0.1.1 2
- chk_join_nr "multi flows, signal, bidi, link fail" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
chk_stale_nr $ns2 1 -1 1
fi
# 2 subflows plus 1 backup subflow with a lossy link, backup
# will never be used
- if reset; then
+ if reset "backup subflow unused, link failure"; then
init_shapers
pm_nl_set_limits $ns1 0 2
pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
@@ -1455,14 +1468,14 @@ link_failure_tests()
FAILING_LINKS="1"
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
run_tests $ns1 $ns2 10.0.1.1 1
- chk_join_nr "backup subflow unused, link failure" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1
chk_link_usage $ns2 ns2eth3 $cinsent 0
fi
# 2 lossy links after half transfer, backup will get half of
# the traffic
- if reset; then
+ if reset "backup flow used, multi links fail"; then
init_shapers
pm_nl_set_limits $ns1 0 2
pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
@@ -1470,7 +1483,7 @@ link_failure_tests()
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
FAILING_LINKS="1 2"
run_tests $ns1 $ns2 10.0.1.1 1
- chk_join_nr "backup flow used, multi links fail" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1
chk_stale_nr $ns2 2 4 2
chk_link_usage $ns2 ns2eth3 $cinsent 50
@@ -1478,7 +1491,7 @@ link_failure_tests()
# use a backup subflow with the first subflow on a lossy link
# for bidirectional transfer
- if reset; then
+ if reset "backup flow used, bidi, link failure"; then
init_shapers
pm_nl_set_limits $ns1 0 2
pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
@@ -1486,7 +1499,7 @@ link_failure_tests()
pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
FAILING_LINKS="1 2"
run_tests $ns1 $ns2 10.0.1.1 2
- chk_join_nr "backup flow used, bidi, link failure" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1
chk_stale_nr $ns2 1 -1 2
chk_link_usage $ns2 ns2eth3 $cinsent 50
@@ -1496,44 +1509,44 @@ link_failure_tests()
add_addr_timeout_tests()
{
# add_addr timeout
- if reset_with_add_addr_timeout; then
+ if reset_with_add_addr_timeout "signal address, ADD_ADDR timeout"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
- chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 4 0
fi
# add_addr timeout IPv6
- if reset_with_add_addr_timeout 6; then
+ if reset_with_add_addr_timeout "signal address, ADD_ADDR6 timeout" 6; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 4 0
fi
# signal addresses timeout
- if reset_with_add_addr_timeout; then
+ if reset_with_add_addr_timeout "signal addresses, ADD_ADDR timeout"; then
pm_nl_set_limits $ns1 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_set_limits $ns2 2 2
run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
- chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 8 0
fi
# signal invalid addresses timeout
- if reset_with_add_addr_timeout; then
+ if reset_with_add_addr_timeout "invalid address, ADD_ADDR timeout"; then
pm_nl_set_limits $ns1 2 2
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_set_limits $ns2 2 2
run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
- chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 8 0
fi
}
@@ -1541,156 +1554,156 @@ add_addr_timeout_tests()
remove_tests()
{
# single subflow, remove
- if reset; then
+ if reset "remove single subflow"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
- chk_join_nr "remove single subflow" 1 1 1
+ chk_join_nr 1 1 1
chk_rm_nr 1 1
fi
# multiple subflows, remove
- if reset; then
+ if reset "remove multiple subflows"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow
- chk_join_nr "remove multiple subflows" 2 2 2
+ chk_join_nr 2 2 2
chk_rm_nr 2 2
fi
# single address, remove
- if reset; then
+ if reset "remove single address"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
- chk_join_nr "remove single address" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
chk_rm_nr 1 1 invert
fi
# subflow and signal, remove
- if reset; then
+ if reset "remove subflow and signal"; then
pm_nl_set_limits $ns1 0 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
- chk_join_nr "remove subflow and signal" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1
chk_rm_nr 1 1
fi
# subflows and signal, remove
- if reset; then
+ if reset "remove subflows and signal"; then
pm_nl_set_limits $ns1 0 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow
- chk_join_nr "remove subflows and signal" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
chk_rm_nr 2 2
fi
# addresses remove
- if reset; then
+ if reset "remove addresses"; then
pm_nl_set_limits $ns1 3 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
pm_nl_set_limits $ns2 3 3
run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
- chk_join_nr "remove addresses" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 3 3
chk_rm_nr 3 3 invert
fi
# invalid addresses remove
- if reset; then
+ if reset "remove invalid addresses"; then
pm_nl_set_limits $ns1 3 3
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
pm_nl_set_limits $ns2 3 3
run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
- chk_join_nr "remove invalid addresses" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 3 3
chk_rm_nr 3 1 invert
fi
# subflows and signal, flush
- if reset; then
+ if reset "flush subflows and signal"; then
pm_nl_set_limits $ns1 0 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
- chk_join_nr "flush subflows and signal" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
chk_rm_nr 2 2
fi
# subflows flush
- if reset; then
+ if reset "flush subflows"; then
pm_nl_set_limits $ns1 3 3
pm_nl_set_limits $ns2 3 3
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
- chk_join_nr "flush subflows" 3 3 3
+ chk_join_nr 3 3 3
chk_rm_nr 3 3
fi
# addresses flush
- if reset; then
+ if reset "flush addresses"; then
pm_nl_set_limits $ns1 3 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
pm_nl_set_limits $ns2 3 3
run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
- chk_join_nr "flush addresses" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 3 3
chk_rm_nr 3 3 invert
fi
# invalid addresses flush
- if reset; then
+ if reset "flush invalid addresses"; then
pm_nl_set_limits $ns1 3 3
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
pm_nl_set_limits $ns2 3 3
run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow
- chk_join_nr "flush invalid addresses" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 3 3
chk_rm_nr 3 1 invert
fi
# remove id 0 subflow
- if reset; then
+ if reset "remove id 0 subflow"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow
- chk_join_nr "remove id 0 subflow" 1 1 1
+ chk_join_nr 1 1 1
chk_rm_nr 1 1
fi
# remove id 0 address
- if reset; then
+ if reset "remove id 0 address"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow
- chk_join_nr "remove id 0 address" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
chk_rm_nr 1 1 invert
fi
@@ -1699,44 +1712,44 @@ remove_tests()
add_tests()
{
# add single subflow
- if reset; then
+ if reset "add single subflow"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
- chk_join_nr "add single subflow" 1 1 1
+ chk_join_nr 1 1 1
fi
# add signal address
- if reset; then
+ if reset "add signal address"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
- chk_join_nr "add signal address" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# add multiple subflows
- if reset; then
+ if reset "add multiple subflows"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2
run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
- chk_join_nr "add multiple subflows" 2 2 2
+ chk_join_nr 2 2 2
fi
# add multiple subflows IPv6
- if reset; then
+ if reset "add multiple subflows IPv6"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2
run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
- chk_join_nr "add multiple subflows IPv6" 2 2 2
+ chk_join_nr 2 2 2
fi
# add multiple addresses IPv6
- if reset; then
+ if reset "add multiple addresses IPv6"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 2 2
run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow
- chk_join_nr "add multiple addresses IPv6" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 2 2
fi
}
@@ -1744,51 +1757,51 @@ add_tests()
ipv6_tests()
{
# subflow IPv6
- if reset; then
+ if reset "single subflow IPv6"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "single subflow IPv6" 1 1 1
+ chk_join_nr 1 1 1
fi
# add_address, unused IPv6
- if reset; then
+ if reset "unused signal address IPv6"; then
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "unused signal address IPv6" 0 0 0
+ chk_join_nr 0 0 0
chk_add_nr 1 1
fi
# signal address IPv6
- if reset; then
+ if reset "single address IPv6"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
- chk_join_nr "single address IPv6" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# single address IPv6, remove
- if reset; then
+ if reset "remove single address IPv6"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow
- chk_join_nr "remove single address IPv6" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
chk_rm_nr 1 1 invert
fi
# subflow and signal IPv6, remove
- if reset; then
+ if reset "remove subflow and signal IPv6"; then
pm_nl_set_limits $ns1 0 2
pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow
- chk_join_nr "remove subflow and signal IPv6" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1
chk_rm_nr 1 1
fi
@@ -1797,120 +1810,120 @@ ipv6_tests()
v4mapped_tests()
{
# subflow IPv4-mapped to IPv4-mapped
- if reset; then
+ if reset "single subflow IPv4-mapped"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "single subflow IPv4-mapped" 1 1 1
+ chk_join_nr 1 1 1
fi
# signal address IPv4-mapped with IPv4-mapped sk
- if reset; then
+ if reset "signal address IPv4-mapped"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "signal address IPv4-mapped" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# subflow v4-map-v6
- if reset; then
+ if reset "single subflow v4-map-v6"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "single subflow v4-map-v6" 1 1 1
+ chk_join_nr 1 1 1
fi
# signal address v4-map-v6
- if reset; then
+ if reset "signal address v4-map-v6"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 "::ffff:10.0.1.1"
- chk_join_nr "signal address v4-map-v6" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# subflow v6-map-v4
- if reset; then
+ if reset "single subflow v6-map-v4"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow v6-map-v4" 1 1 1
+ chk_join_nr 1 1 1
fi
# signal address v6-map-v4
- if reset; then
+ if reset "signal address v6-map-v4"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address v6-map-v4" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# no subflow IPv6 to v4 address
- if reset; then
+ if reset "no JOIN with diff families v4-v6"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "no JOIN with diff families v4-v6" 0 0 0
+ chk_join_nr 0 0 0
fi
# no subflow IPv6 to v4 address even if v6 has a valid v4 at the end
- if reset; then
+ if reset "no JOIN with diff families v4-v6-2"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 dead:beef:2::10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "no JOIN with diff families v4-v6-2" 0 0 0
+ chk_join_nr 0 0 0
fi
# no subflow IPv4 to v6 address, no need to slow down too then
- if reset; then
+ if reset "no JOIN with diff families v6-v4"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 dead:beef:1::1
- chk_join_nr "no JOIN with diff families v6-v4" 0 0 0
+ chk_join_nr 0 0 0
fi
}
backup_tests()
{
# single subflow, backup
- if reset; then
+ if reset "single subflow, backup"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup
- chk_join_nr "single subflow, backup" 1 1 1
+ chk_join_nr 1 1 1
chk_prio_nr 0 1
fi
# single address, backup
- if reset; then
+ if reset "single address, backup"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
- chk_join_nr "single address, backup" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
chk_prio_nr 1 0
fi
# single address with port, backup
- if reset; then
+ if reset "single address with port, backup"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
- chk_join_nr "single address with port, backup" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
chk_prio_nr 1 0
fi
@@ -1919,81 +1932,81 @@ backup_tests()
add_addr_ports_tests()
{
# signal address with port
- if reset; then
+ if reset "signal address with port"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address with port" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1 1
fi
# subflow and signal with port
- if reset; then
+ if reset "subflow and signal with port"; then
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and signal with port" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1 1
fi
# single address with port, remove
- if reset; then
+ if reset "remove single address with port"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 1
run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
- chk_join_nr "remove single address with port" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1 1
chk_rm_nr 1 1 invert
fi
# subflow and signal with port, remove
- if reset; then
+ if reset "remove subflow and signal with port"; then
pm_nl_set_limits $ns1 0 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
- chk_join_nr "remove subflow and signal with port" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1 1
chk_rm_nr 1 1
fi
# subflows and signal with port, flush
- if reset; then
+ if reset "flush subflows and signal with port"; then
pm_nl_set_limits $ns1 0 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow
- chk_join_nr "flush subflows and signal with port" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
chk_rm_nr 2 2
fi
# multiple addresses with port
- if reset; then
+ if reset "multiple addresses with port"; then
pm_nl_set_limits $ns1 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10100
pm_nl_set_limits $ns2 2 2
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple addresses with port" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 2 2 2
fi
# multiple addresses with ports
- if reset; then
+ if reset "multiple addresses with ports"; then
pm_nl_set_limits $ns1 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10101
pm_nl_set_limits $ns2 2 2
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple addresses with ports" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 2 2 2
fi
}
@@ -2001,64 +2014,64 @@ add_addr_ports_tests()
syncookies_tests()
{
# single subflow, syncookies
- if reset_with_cookies; then
+ if reset_with_cookies "single subflow with syn cookies"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow with syn cookies" 1 1 1
+ chk_join_nr 1 1 1
fi
# multiple subflows with syn cookies
- if reset_with_cookies; then
+ if reset_with_cookies "multiple subflows with syn cookies"; then
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "multiple subflows with syn cookies" 2 2 2
+ chk_join_nr 2 2 2
fi
# multiple subflows limited by server
- if reset_with_cookies; then
+ if reset_with_cookies "subflows limited by server w cookies"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflows limited by server w cookies" 2 1 1
+ chk_join_nr 2 1 1
fi
# test signal address with cookies
- if reset_with_cookies; then
+ if reset_with_cookies "signal address with syn cookies"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address with syn cookies" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# test cookie with subflow and signal
- if reset_with_cookies; then
+ if reset_with_cookies "subflow and signal w cookies"; then
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns1 0 2
pm_nl_set_limits $ns2 1 2
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and signal w cookies" 2 2 2
+ chk_join_nr 2 2 2
chk_add_nr 1 1
fi
# accept and use add_addr with additional subflows
- if reset_with_cookies; then
+ if reset_with_cookies "subflows and signal w. cookies"; then
pm_nl_set_limits $ns1 0 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflows and signal w. cookies" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
fi
}
@@ -2070,7 +2083,7 @@ checksum_tests()
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "checksum test 0 0"
+ chk_csum_nr 1
fi
# checksum test 1 1
@@ -2078,7 +2091,7 @@ checksum_tests()
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "checksum test 1 1"
+ chk_csum_nr 1
fi
# checksum test 0 1
@@ -2086,7 +2099,7 @@ checksum_tests()
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "checksum test 0 1"
+ chk_csum_nr 1
fi
# checksum test 1 0
@@ -2094,70 +2107,70 @@ checksum_tests()
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
run_tests $ns1 $ns2 10.0.1.1
- chk_csum_nr "checksum test 1 0"
+ chk_csum_nr 1
fi
}
deny_join_id0_tests()
{
# subflow allow join id0 ns1
- if reset_with_allow_join_id0 1 0; then
+ if reset_with_allow_join_id0 "single subflow allow join id0 ns1" 1 0; then
pm_nl_set_limits $ns1 1 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow allow join id0 ns1" 1 1 1
+ chk_join_nr 1 1 1
fi
# subflow allow join id0 ns2
- if reset_with_allow_join_id0 0 1; then
+ if reset_with_allow_join_id0 "single subflow allow join id0 ns2" 0 1; then
pm_nl_set_limits $ns1 1 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "single subflow allow join id0 ns2" 0 0 0
+ chk_join_nr 0 0 0
fi
# signal address allow join id0 ns1
# ADD_ADDRs are not affected by allow_join_id0 value.
- if reset_with_allow_join_id0 1 0; then
+ if reset_with_allow_join_id0 "signal address allow join id0 ns1" 1 0; then
pm_nl_set_limits $ns1 1 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address allow join id0 ns1" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# signal address allow join id0 ns2
# ADD_ADDRs are not affected by allow_join_id0 value.
- if reset_with_allow_join_id0 0 1; then
+ if reset_with_allow_join_id0 "signal address allow join id0 ns2" 0 1; then
pm_nl_set_limits $ns1 1 1
pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "signal address allow join id0 ns2" 1 1 1
+ chk_join_nr 1 1 1
chk_add_nr 1 1
fi
# subflow and address allow join id0 ns1
- if reset_with_allow_join_id0 1 0; then
+ if reset_with_allow_join_id0 "subflow and address allow join id0 1" 1 0; then
pm_nl_set_limits $ns1 2 2
pm_nl_set_limits $ns2 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and address allow join id0 1" 2 2 2
+ chk_join_nr 2 2 2
fi
# subflow and address allow join id0 ns2
- if reset_with_allow_join_id0 0 1; then
+ if reset_with_allow_join_id0 "subflow and address allow join id0 2" 0 1; then
pm_nl_set_limits $ns1 2 2
pm_nl_set_limits $ns2 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "subflow and address allow join id0 2" 1 1 1
+ chk_join_nr 1 1 1
fi
}
@@ -2166,37 +2179,37 @@ fullmesh_tests()
# fullmesh 1
# 2 fullmesh addrs in ns2, added before the connection,
# 1 non-fullmesh addr in ns1, added during the connection.
- if reset; then
+ if reset "fullmesh test 2x1"; then
pm_nl_set_limits $ns1 0 4
pm_nl_set_limits $ns2 1 4
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh
run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
- chk_join_nr "fullmesh test 2x1" 4 4 4
+ chk_join_nr 4 4 4
chk_add_nr 1 1
fi
# fullmesh 2
# 1 non-fullmesh addr in ns1, added before the connection,
# 1 fullmesh addr in ns2, added during the connection.
- if reset; then
+ if reset "fullmesh test 1x1"; then
pm_nl_set_limits $ns1 1 3
pm_nl_set_limits $ns2 1 3
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow
- chk_join_nr "fullmesh test 1x1" 3 3 3
+ chk_join_nr 3 3 3
chk_add_nr 1 1
fi
# fullmesh 3
# 1 non-fullmesh addr in ns1, added before the connection,
# 2 fullmesh addrs in ns2, added during the connection.
- if reset; then
+ if reset "fullmesh test 1x2"; then
pm_nl_set_limits $ns1 2 5
pm_nl_set_limits $ns2 1 5
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
- chk_join_nr "fullmesh test 1x2" 5 5 5
+ chk_join_nr 5 5 5
chk_add_nr 1 1
fi
@@ -2204,53 +2217,53 @@ fullmesh_tests()
# 1 non-fullmesh addr in ns1, added before the connection,
# 2 fullmesh addrs in ns2, added during the connection,
# limit max_subflows to 4.
- if reset; then
+ if reset "fullmesh test 1x2, limited"; then
pm_nl_set_limits $ns1 2 4
pm_nl_set_limits $ns2 1 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
- chk_join_nr "fullmesh test 1x2, limited" 4 4 4
+ chk_join_nr 4 4 4
chk_add_nr 1 1
fi
# set fullmesh flag
- if reset; then
+ if reset "set fullmesh flag test"; then
pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
pm_nl_set_limits $ns2 4 4
run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh
- chk_join_nr "set fullmesh flag test" 2 2 2
+ chk_join_nr 2 2 2
chk_rm_nr 0 1
fi
# set nofullmesh flag
- if reset; then
+ if reset "set nofullmesh flag test"; then
pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh
pm_nl_set_limits $ns2 4 4
run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh
- chk_join_nr "set nofullmesh flag test" 2 2 2
+ chk_join_nr 2 2 2
chk_rm_nr 0 1
fi
# set backup,fullmesh flags
- if reset; then
+ if reset "set backup,fullmesh flags test"; then
pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
pm_nl_set_limits $ns2 4 4
run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow backup,fullmesh
- chk_join_nr "set backup,fullmesh flags test" 2 2 2
+ chk_join_nr 2 2 2
chk_prio_nr 0 1
chk_rm_nr 0 1
fi
# set nobackup,nofullmesh flags
- if reset; then
+ if reset "set nobackup,nofullmesh flags test"; then
pm_nl_set_limits $ns1 4 4
pm_nl_set_limits $ns2 4 4
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup,nofullmesh
- chk_join_nr "set nobackup,nofullmesh flags test" 2 2 2
+ chk_join_nr 2 2 2
chk_prio_nr 0 1
chk_rm_nr 0 1
fi
@@ -2259,67 +2272,67 @@ fullmesh_tests()
userspace_tests()
{
# userspace pm type prevents add_addr
- if reset; then
+ if reset "userspace pm type prevents add_addr"; then
ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
ip netns exec $ns1 ./pm_nl_ctl limits 0 2
ip netns exec $ns2 ./pm_nl_ctl limits 0 2
ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type prevents add_addr" 0 0 0
+ chk_join_nr 0 0 0
chk_add_nr 0 0
fi
# userspace pm type echoes add_addr
- if reset; then
+ if reset "userspace pm type echoes add_addr"; then
ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
ip netns exec $ns1 ./pm_nl_ctl limits 0 2
ip netns exec $ns2 ./pm_nl_ctl limits 0 2
ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type echoes add_addr" 0 0 0
+ chk_join_nr 0 0 0
chk_add_nr 1 1
fi
# userspace pm type rejects join
- if reset; then
+ if reset "userspace pm type rejects join"; then
ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
ip netns exec $ns1 ./pm_nl_ctl limits 1 1
ip netns exec $ns2 ./pm_nl_ctl limits 1 1
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type rejects join" 1 1 0
+ chk_join_nr 1 1 0
fi
# userspace pm type does not send join
- if reset; then
+ if reset "userspace pm type does not send join"; then
ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
ip netns exec $ns1 ./pm_nl_ctl limits 1 1
ip netns exec $ns2 ./pm_nl_ctl limits 1 1
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
- chk_join_nr "userspace pm type does not send join" 0 0 0
+ chk_join_nr 0 0 0
fi
# userspace pm type prevents mp_prio
- if reset; then
+ if reset "userspace pm type prevents mp_prio"; then
ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
ip netns exec $ns1 ./pm_nl_ctl limits 1 1
ip netns exec $ns2 ./pm_nl_ctl limits 1 1
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
- chk_join_nr "userspace pm type prevents mp_prio" 1 1 0
+ chk_join_nr 1 1 0
chk_prio_nr 0 0
fi
# userspace pm type prevents rm_addr
- if reset; then
+ if reset "userspace pm type prevents rm_addr"; then
ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
ip netns exec $ns1 ./pm_nl_ctl limits 0 1
ip netns exec $ns2 ./pm_nl_ctl limits 0 1
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
- chk_join_nr "userspace pm type prevents rm_addr" 0 0 0
+ chk_join_nr 0 0 0
chk_rm_nr 0 0
fi
}
@@ -2344,7 +2357,7 @@ usage()
echo " -i use ip mptcp"
echo " -h help"
- echo "[test ids]"
+ echo "[test ids|names]"
exit ${ret}
}
@@ -2409,9 +2422,9 @@ shift $((OPTIND - 1))
for arg in "${@}"; do
if [[ "${arg}" =~ ^[0-9]+$ ]]; then
- only_tests+=("${arg}")
+ only_tests_ids+=("${arg}")
else
- usage "Unknown argument: ${arg}"
+ only_tests_names+=("${arg}")
fi
done
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH mptcp-next v2 5/9] selftests: mptcp: join: alt. to exec specific tests
2022-02-17 17:43 ` [PATCH mptcp-next v2 5/9] selftests: mptcp: join: alt. to exec " Matthieu Baerts
@ 2022-02-18 0:35 ` Mat Martineau
2022-02-18 10:40 ` Matthieu Baerts
0 siblings, 1 reply; 19+ messages in thread
From: Mat Martineau @ 2022-02-18 0:35 UTC (permalink / raw)
To: Matthieu Baerts; +Cc: mptcp
On Thu, 17 Feb 2022, Matthieu Baerts wrote:
> Running a specific test by giving the ID is often what we want: the CI
> reports an issue with the Nth test, it is reproduceable with
> ./mptcp_join.sh N
>
> But this doesn't work when a test is unstable and it is needed to find
> since when it is unstable because the ID is a counter and new tests can
> be added before changing the ID of a specific test.
>
Could you rephrase or split up this sentence to make it easier to parse?
> Remembering the current test can also help listing failed tests at the
> end.
>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> ---
> .../testing/selftests/net/mptcp/mptcp_join.sh | 441 +++++++++---------
> 1 file changed, 227 insertions(+), 214 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index 6b43aa37c370..de701de19219 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -20,8 +20,10 @@ check_invert=0
> init=0
>
> declare -A all_tests
> -declare -a only_tests
> +declare -a only_tests_ids
> +declare -a only_tests_names
> TEST_COUNT=0
> +TEST_NAME=""
> nr_blank=40
>
> export FAILING_LINKS=""
> @@ -152,22 +154,30 @@ cleanup()
>
> skip_test()
> {
> - if [ "${#only_tests[@]}" -eq 0 ]; then
> + if [ "${#only_tests_ids[@]}" -eq 0 ] && [ "${#only_tests_names[@]}" -eq 0 ]; then
> return 1
> fi
>
> local i
> - for i in "${only_tests[@]}"; do
> + for i in "${only_tests_ids[@]}"; do
> if [ "${TEST_COUNT}" -eq "${i}" ]; then
> return 1
> fi
> done
> + for i in "${only_tests_names[@]}"; do
> + if [ "${TEST_NAME}" = "${i}" ]; then
> + return 1
> + fi
> + done
>
> return 0
> }
>
> +# $1: test name
> reset()
> {
> + TEST_NAME="${1}"
> +
> TEST_COUNT=$((TEST_COUNT+1))
>
> if skip_test; then
> @@ -185,27 +195,29 @@ reset()
> return 0
> }
>
> +# $1: test name
> reset_with_cookies()
> {
> - reset || return 1
> + reset "${1}" || return 1
>
> for netns in "$ns1" "$ns2";do
> ip netns exec $netns sysctl -q net.ipv4.tcp_syncookies=2
> done
> }
>
> +# $1: test name
> reset_with_add_addr_timeout()
> {
> - local ip="${1:-4}"
> + local ip="${2:-4}"
> local tables
>
> + reset "${1}" || return 1
> +
> tables="iptables"
> if [ $ip -eq 6 ]; then
> tables="ip6tables"
> fi
>
> - reset || return 1
> -
> ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
> ip netns exec $ns2 $tables -A OUTPUT -p tcp \
> -m tcp --tcp-option 30 \
> @@ -214,12 +226,13 @@ reset_with_add_addr_timeout()
> -j DROP
> }
>
> +# $1: test name
> reset_with_checksum()
> {
> local ns1_enable=$1
> local ns2_enable=$2
>
> - reset || return 1
> + reset "checksum test ${1} ${2}" || 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
> @@ -227,10 +240,10 @@ reset_with_checksum()
>
> reset_with_allow_join_id0()
> {
> - local ns1_enable=$1
> - local ns2_enable=$2
> + local ns1_enable=$2
> + local ns2_enable=$3
>
> - reset || return 1
> + reset "${1}" || return 1
>
> ip netns exec $ns1 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns1_enable
> ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns2_enable
> @@ -769,8 +782,9 @@ chk_csum_nr()
> local count
> local dump_stats
>
> - if [ ! -z "$msg" ]; then
> + if [ "${msg}" = 1 ]; then
> printf "%03u" "$TEST_COUNT"
> + msg="${TEST_TITLE}"
> else
> echo -n " "
> fi
> @@ -863,15 +877,14 @@ chk_infi_nr()
>
> chk_join_nr()
> {
> - local msg="$1"
> - local syn_nr=$2
> - local syn_ack_nr=$3
> - local ack_nr=$4
> + local syn_nr=$1
> + local syn_ack_nr=$2
> + local ack_nr=$3
> local count
> local dump_stats
> local with_cookie
>
> - printf "%03u %-36s %s" "$TEST_COUNT" "$msg" "syn"
> + printf "%03u %-36s %s" "${TEST_COUNT}" "${TEST_NAME}" "syn"
> count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinSynRx | awk '{print $2}'`
> [ -z "$count" ] && count=0
> if [ "$count" != "$syn_nr" ]; then
> @@ -1197,65 +1210,65 @@ wait_attempt_fail()
>
> subflows_tests()
> {
> - if reset; then
> + if reset "no JOIN"; then
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "no JOIN" 0 0 0
> + chk_join_nr 0 0 0
> fi
>
> # subflow limited by client
> - if reset; then
> + if reset "single subflow, limited by client"; then
> pm_nl_set_limits $ns1 0 0
> pm_nl_set_limits $ns2 0 0
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow, limited by client" 0 0 0
> + chk_join_nr 0 0 0
> fi
>
> # subflow limited by server
> - if reset; then
> + if reset "single subflow, limited by server"; then
> pm_nl_set_limits $ns1 0 0
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow, limited by server" 1 1 0
> + chk_join_nr 1 1 0
> fi
>
> # subflow
> - if reset; then
> + if reset "single subflow"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # multiple subflows
> - if reset; then
> + if reset "multiple subflows"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 0 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "multiple subflows" 2 2 2
> + chk_join_nr 2 2 2
> fi
>
> # multiple subflows limited by server
> - if reset; then
> + if reset "multiple subflows, limited by server"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "multiple subflows, limited by server" 2 2 1
> + chk_join_nr 2 2 1
> fi
>
> # single subflow, dev
> - if reset; then
> + if reset "single subflow, dev"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow dev ns2eth3
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow, dev" 1 1 1
> + chk_join_nr 1 1 1
> fi
> }
>
> @@ -1263,40 +1276,40 @@ subflows_error_tests()
> {
> # If a single subflow is configured, and matches the MPC src
> # address, no additional subflow should be created
> - if reset; then
> + if reset "no MPC reuse with single endpoint"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> - chk_join_nr "no MPC reuse with single endpoint" 0 0 0
> + chk_join_nr 0 0 0
> fi
>
> # multiple subflows, with subflow creation error
> - if reset; then
> + if reset "multi subflows, with failing subflow"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 0 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
> ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> - chk_join_nr "multi subflows, with failing subflow" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # multiple subflows, with subflow timeout on MPJ
> - if reset; then
> + if reset "multi subflows, with subflow timeout"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 0 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
> ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> - chk_join_nr "multi subflows, with subflow timeout" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # multiple subflows, check that the endpoint corresponding to
> # closed subflow (due to reset) is not reused if additional
> # subflows are added later
> - if reset; then
> + if reset "multi subflows, fair usage on close"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> @@ -1310,27 +1323,27 @@ subflows_error_tests()
>
> # additional subflow could be created only if the PM select
> # the later endpoint, skipping the already used one
> - chk_join_nr "multi subflows, fair usage on close" 1 1 1
> + chk_join_nr 1 1 1
> fi
> }
>
> signal_address_tests()
> {
> # add_address, unused
> - if reset; then
> + if reset "unused signal address"; then
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "unused signal address" 0 0 0
> + chk_join_nr 0 0 0
> chk_add_nr 1 1
> fi
>
> # accept and use add_addr
> - if reset; then
> + if reset "signal address"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal address" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> @@ -1338,54 +1351,54 @@ signal_address_tests()
> # note: signal address in server ns and local addresses in client ns must
> # belong to different subnets or one of the listed local address could be
> # used for 'add_addr' subflow
> - if reset; then
> + if reset "subflow and signal"; then
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 1 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "subflow and signal" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1
> fi
>
> # accept and use add_addr with additional subflows
> - if reset; then
> + if reset "multiple subflows and signal"; then
> pm_nl_set_limits $ns1 0 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 3
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "multiple subflows and signal" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> fi
>
> # signal addresses
> - if reset; then
> + if reset "signal addresses"; then
> pm_nl_set_limits $ns1 3 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
> pm_nl_set_limits $ns2 3 3
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal addresses" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 3 3
> fi
>
> # signal invalid addresses
> - if reset; then
> + if reset "signal invalid addresses"; then
> pm_nl_set_limits $ns1 3 3
> pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
> pm_nl_set_limits $ns2 3 3
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal invalid addresses" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 3 3
> fi
>
> # signal addresses race test
> - if reset; then
> + if reset "signal addresses race test"; then
> pm_nl_set_limits $ns1 4 4
> pm_nl_set_limits $ns2 4 4
> pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
> @@ -1400,7 +1413,7 @@ signal_address_tests()
> # the peer could possibly miss some addr notification, allow retransmission
> ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> - chk_join_nr "signal addresses race test" 3 3 3
> + chk_join_nr 3 3 3
>
> # the server will not signal the address terminating
> # the MPC subflow
> @@ -1411,7 +1424,7 @@ signal_address_tests()
> link_failure_tests()
> {
> # accept and use add_addr with additional subflows and link loss
> - if reset; then
> + if reset "multiple flows, signal, link failure"; then
> # without any b/w limit each veth could spool the packets and get
> # them acked at xmit time, so that the corresponding subflow will
> # have almost always no outstanding pkts, the scheduler will pick
> @@ -1425,14 +1438,14 @@ link_failure_tests()
> pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 1
> - chk_join_nr "multiple flows, signal, link failure" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> chk_stale_nr $ns2 1 5 1
> fi
>
> # accept and use add_addr with additional subflows and link loss
> # for bidirectional transfer
> - if reset; then
> + if reset "multi flows, signal, bidi, link fail"; then
> init_shapers
> pm_nl_set_limits $ns1 0 3
> pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
> @@ -1440,14 +1453,14 @@ link_failure_tests()
> pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 2
> - chk_join_nr "multi flows, signal, bidi, link fail" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> chk_stale_nr $ns2 1 -1 1
> fi
>
> # 2 subflows plus 1 backup subflow with a lossy link, backup
> # will never be used
> - if reset; then
> + if reset "backup subflow unused, link failure"; then
> init_shapers
> pm_nl_set_limits $ns1 0 2
> pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
> @@ -1455,14 +1468,14 @@ link_failure_tests()
> FAILING_LINKS="1"
> pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
> run_tests $ns1 $ns2 10.0.1.1 1
> - chk_join_nr "backup subflow unused, link failure" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1
> chk_link_usage $ns2 ns2eth3 $cinsent 0
> fi
>
> # 2 lossy links after half transfer, backup will get half of
> # the traffic
> - if reset; then
> + if reset "backup flow used, multi links fail"; then
> init_shapers
> pm_nl_set_limits $ns1 0 2
> pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
> @@ -1470,7 +1483,7 @@ link_failure_tests()
> pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
> FAILING_LINKS="1 2"
> run_tests $ns1 $ns2 10.0.1.1 1
> - chk_join_nr "backup flow used, multi links fail" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1
> chk_stale_nr $ns2 2 4 2
> chk_link_usage $ns2 ns2eth3 $cinsent 50
> @@ -1478,7 +1491,7 @@ link_failure_tests()
>
> # use a backup subflow with the first subflow on a lossy link
> # for bidirectional transfer
> - if reset; then
> + if reset "backup flow used, bidi, link failure"; then
> init_shapers
> pm_nl_set_limits $ns1 0 2
> pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal
> @@ -1486,7 +1499,7 @@ link_failure_tests()
> pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup
> FAILING_LINKS="1 2"
> run_tests $ns1 $ns2 10.0.1.1 2
> - chk_join_nr "backup flow used, bidi, link failure" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1
> chk_stale_nr $ns2 1 -1 2
> chk_link_usage $ns2 ns2eth3 $cinsent 50
> @@ -1496,44 +1509,44 @@ link_failure_tests()
> add_addr_timeout_tests()
> {
> # add_addr timeout
> - if reset_with_add_addr_timeout; then
> + if reset_with_add_addr_timeout "signal address, ADD_ADDR timeout"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> - chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 4 0
> fi
>
> # add_addr timeout IPv6
> - if reset_with_add_addr_timeout 6; then
> + if reset_with_add_addr_timeout "signal address, ADD_ADDR6 timeout" 6; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
> run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
> - chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 4 0
> fi
>
> # signal addresses timeout
> - if reset_with_add_addr_timeout; then
> + if reset_with_add_addr_timeout "signal addresses, ADD_ADDR timeout"; then
> pm_nl_set_limits $ns1 2 2
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_set_limits $ns2 2 2
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
> - chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 8 0
> fi
>
> # signal invalid addresses timeout
> - if reset_with_add_addr_timeout; then
> + if reset_with_add_addr_timeout "invalid address, ADD_ADDR timeout"; then
> pm_nl_set_limits $ns1 2 2
> pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_set_limits $ns2 2 2
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 least
> - chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 8 0
> fi
> }
> @@ -1541,156 +1554,156 @@ add_addr_timeout_tests()
> remove_tests()
> {
> # single subflow, remove
> - if reset; then
> + if reset "remove single subflow"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
> - chk_join_nr "remove single subflow" 1 1 1
> + chk_join_nr 1 1 1
> chk_rm_nr 1 1
> fi
>
> # multiple subflows, remove
> - if reset; then
> + if reset "remove multiple subflows"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 0 2
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow
> - chk_join_nr "remove multiple subflows" 2 2 2
> + chk_join_nr 2 2 2
> chk_rm_nr 2 2
> fi
>
> # single address, remove
> - if reset; then
> + if reset "remove single address"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
> - chk_join_nr "remove single address" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> chk_rm_nr 1 1 invert
> fi
>
> # subflow and signal, remove
> - if reset; then
> + if reset "remove subflow and signal"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
> - chk_join_nr "remove subflow and signal" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1
> chk_rm_nr 1 1
> fi
>
> # subflows and signal, remove
> - if reset; then
> + if reset "remove subflows and signal"; then
> pm_nl_set_limits $ns1 0 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 3
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow
> - chk_join_nr "remove subflows and signal" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> chk_rm_nr 2 2
> fi
>
> # addresses remove
> - if reset; then
> + if reset "remove addresses"; then
> pm_nl_set_limits $ns1 3 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
> pm_nl_set_limits $ns2 3 3
> run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
> - chk_join_nr "remove addresses" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 3 3
> chk_rm_nr 3 3 invert
> fi
>
> # invalid addresses remove
> - if reset; then
> + if reset "remove invalid addresses"; then
> pm_nl_set_limits $ns1 3 3
> pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
> pm_nl_set_limits $ns2 3 3
> run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow
> - chk_join_nr "remove invalid addresses" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 3 3
> chk_rm_nr 3 1 invert
> fi
>
> # subflows and signal, flush
> - if reset; then
> + if reset "flush subflows and signal"; then
> pm_nl_set_limits $ns1 0 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 3
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
> - chk_join_nr "flush subflows and signal" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> chk_rm_nr 2 2
> fi
>
> # subflows flush
> - if reset; then
> + if reset "flush subflows"; then
> pm_nl_set_limits $ns1 3 3
> pm_nl_set_limits $ns2 3 3
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
> - chk_join_nr "flush subflows" 3 3 3
> + chk_join_nr 3 3 3
> chk_rm_nr 3 3
> fi
>
> # addresses flush
> - if reset; then
> + if reset "flush addresses"; then
> pm_nl_set_limits $ns1 3 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
> pm_nl_set_limits $ns2 3 3
> run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow
> - chk_join_nr "flush addresses" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 3 3
> chk_rm_nr 3 3 invert
> fi
>
> # invalid addresses flush
> - if reset; then
> + if reset "flush invalid addresses"; then
> pm_nl_set_limits $ns1 3 3
> pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
> pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
> pm_nl_set_limits $ns2 3 3
> run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow
> - chk_join_nr "flush invalid addresses" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 3 3
> chk_rm_nr 3 1 invert
> fi
>
> # remove id 0 subflow
> - if reset; then
> + if reset "remove id 0 subflow"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow
> - chk_join_nr "remove id 0 subflow" 1 1 1
> + chk_join_nr 1 1 1
> chk_rm_nr 1 1
> fi
>
> # remove id 0 address
> - if reset; then
> + if reset "remove id 0 address"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow
> - chk_join_nr "remove id 0 address" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> chk_rm_nr 1 1 invert
> fi
> @@ -1699,44 +1712,44 @@ remove_tests()
> add_tests()
> {
> # add single subflow
> - if reset; then
> + if reset "add single subflow"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow
> - chk_join_nr "add single subflow" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # add signal address
> - if reset; then
> + if reset "add signal address"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
> - chk_join_nr "add signal address" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # add multiple subflows
> - if reset; then
> + if reset "add multiple subflows"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 0 2
> run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow
> - chk_join_nr "add multiple subflows" 2 2 2
> + chk_join_nr 2 2 2
> fi
>
> # add multiple subflows IPv6
> - if reset; then
> + if reset "add multiple subflows IPv6"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 0 2
> run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow
> - chk_join_nr "add multiple subflows IPv6" 2 2 2
> + chk_join_nr 2 2 2
> fi
>
> # add multiple addresses IPv6
> - if reset; then
> + if reset "add multiple addresses IPv6"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 2 2
> run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow
> - chk_join_nr "add multiple addresses IPv6" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 2 2
> fi
> }
> @@ -1744,51 +1757,51 @@ add_tests()
> ipv6_tests()
> {
> # subflow IPv6
> - if reset; then
> + if reset "single subflow IPv6"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
> run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
> - chk_join_nr "single subflow IPv6" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # add_address, unused IPv6
> - if reset; then
> + if reset "unused signal address IPv6"; then
> pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
> run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
> - chk_join_nr "unused signal address IPv6" 0 0 0
> + chk_join_nr 0 0 0
> chk_add_nr 1 1
> fi
>
> # signal address IPv6
> - if reset; then
> + if reset "single address IPv6"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow
> - chk_join_nr "single address IPv6" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # single address IPv6, remove
> - if reset; then
> + if reset "remove single address IPv6"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow
> - chk_join_nr "remove single address IPv6" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> chk_rm_nr 1 1 invert
> fi
>
> # subflow and signal IPv6, remove
> - if reset; then
> + if reset "remove subflow and signal IPv6"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal
> pm_nl_set_limits $ns2 1 2
> pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow
> run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow
> - chk_join_nr "remove subflow and signal IPv6" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1
> chk_rm_nr 1 1
> fi
> @@ -1797,120 +1810,120 @@ ipv6_tests()
> v4mapped_tests()
> {
> # subflow IPv4-mapped to IPv4-mapped
> - if reset; then
> + if reset "single subflow IPv4-mapped"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
> run_tests $ns1 $ns2 "::ffff:10.0.1.1"
> - chk_join_nr "single subflow IPv4-mapped" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # signal address IPv4-mapped with IPv4-mapped sk
> - if reset; then
> + if reset "signal address IPv4-mapped"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
> run_tests $ns1 $ns2 "::ffff:10.0.1.1"
> - chk_join_nr "signal address IPv4-mapped" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # subflow v4-map-v6
> - if reset; then
> + if reset "single subflow v4-map-v6"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 "::ffff:10.0.1.1"
> - chk_join_nr "single subflow v4-map-v6" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # signal address v4-map-v6
> - if reset; then
> + if reset "signal address v4-map-v6"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 "::ffff:10.0.1.1"
> - chk_join_nr "signal address v4-map-v6" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # subflow v6-map-v4
> - if reset; then
> + if reset "single subflow v6-map-v4"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow v6-map-v4" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # signal address v6-map-v4
> - if reset; then
> + if reset "signal address v6-map-v4"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal address v6-map-v4" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # no subflow IPv6 to v4 address
> - if reset; then
> + if reset "no JOIN with diff families v4-v6"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "no JOIN with diff families v4-v6" 0 0 0
> + chk_join_nr 0 0 0
> fi
>
> # no subflow IPv6 to v4 address even if v6 has a valid v4 at the end
> - if reset; then
> + if reset "no JOIN with diff families v4-v6-2"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 dead:beef:2::10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "no JOIN with diff families v4-v6-2" 0 0 0
> + chk_join_nr 0 0 0
> fi
>
> # no subflow IPv4 to v6 address, no need to slow down too then
> - if reset; then
> + if reset "no JOIN with diff families v6-v4"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 dead:beef:1::1
> - chk_join_nr "no JOIN with diff families v6-v4" 0 0 0
> + chk_join_nr 0 0 0
> fi
> }
>
> backup_tests()
> {
> # single subflow, backup
> - if reset; then
> + if reset "single subflow, backup"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup
> - chk_join_nr "single subflow, backup" 1 1 1
> + chk_join_nr 1 1 1
> chk_prio_nr 0 1
> fi
>
> # single address, backup
> - if reset; then
> + if reset "single address, backup"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
> - chk_join_nr "single address, backup" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> chk_prio_nr 1 0
> fi
>
> # single address with port, backup
> - if reset; then
> + if reset "single address with port, backup"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
> - chk_join_nr "single address with port, backup" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> chk_prio_nr 1 0
> fi
> @@ -1919,81 +1932,81 @@ backup_tests()
> add_addr_ports_tests()
> {
> # signal address with port
> - if reset; then
> + if reset "signal address with port"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal address with port" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1 1
> fi
>
> # subflow and signal with port
> - if reset; then
> + if reset "subflow and signal with port"; then
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 1 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "subflow and signal with port" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1 1
> fi
>
> # single address with port, remove
> - if reset; then
> + if reset "remove single address with port"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> pm_nl_set_limits $ns2 1 1
> run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow
> - chk_join_nr "remove single address with port" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1 1
> chk_rm_nr 1 1 invert
> fi
>
> # subflow and signal with port, remove
> - if reset; then
> + if reset "remove subflow and signal with port"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> pm_nl_set_limits $ns2 1 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow
> - chk_join_nr "remove subflow and signal with port" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1 1
> chk_rm_nr 1 1
> fi
>
> # subflows and signal with port, flush
> - if reset; then
> + if reset "flush subflows and signal with port"; then
> pm_nl_set_limits $ns1 0 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> pm_nl_set_limits $ns2 1 3
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow
> - chk_join_nr "flush subflows and signal with port" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> chk_rm_nr 2 2
> fi
>
> # multiple addresses with port
> - if reset; then
> + if reset "multiple addresses with port"; then
> pm_nl_set_limits $ns1 2 2
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10100
> pm_nl_set_limits $ns2 2 2
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "multiple addresses with port" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 2 2 2
> fi
>
> # multiple addresses with ports
> - if reset; then
> + if reset "multiple addresses with ports"; then
> pm_nl_set_limits $ns1 2 2
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
> pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10101
> pm_nl_set_limits $ns2 2 2
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "multiple addresses with ports" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 2 2 2
> fi
> }
> @@ -2001,64 +2014,64 @@ add_addr_ports_tests()
> syncookies_tests()
> {
> # single subflow, syncookies
> - if reset_with_cookies; then
> + if reset_with_cookies "single subflow with syn cookies"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow with syn cookies" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # multiple subflows with syn cookies
> - if reset_with_cookies; then
> + if reset_with_cookies "multiple subflows with syn cookies"; then
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 0 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "multiple subflows with syn cookies" 2 2 2
> + chk_join_nr 2 2 2
> fi
>
> # multiple subflows limited by server
> - if reset_with_cookies; then
> + if reset_with_cookies "subflows limited by server w cookies"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "subflows limited by server w cookies" 2 1 1
> + chk_join_nr 2 1 1
> fi
>
> # test signal address with cookies
> - if reset_with_cookies; then
> + if reset_with_cookies "signal address with syn cookies"; then
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal address with syn cookies" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # test cookie with subflow and signal
> - if reset_with_cookies; then
> + if reset_with_cookies "subflow and signal w cookies"; then
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns1 0 2
> pm_nl_set_limits $ns2 1 2
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "subflow and signal w cookies" 2 2 2
> + chk_join_nr 2 2 2
> chk_add_nr 1 1
> fi
>
> # accept and use add_addr with additional subflows
> - if reset_with_cookies; then
> + if reset_with_cookies "subflows and signal w. cookies"; then
> pm_nl_set_limits $ns1 0 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_set_limits $ns2 1 3
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "subflows and signal w. cookies" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> fi
> }
> @@ -2070,7 +2083,7 @@ checksum_tests()
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> run_tests $ns1 $ns2 10.0.1.1
> - chk_csum_nr "checksum test 0 0"
> + chk_csum_nr 1
> fi
>
> # checksum test 1 1
> @@ -2078,7 +2091,7 @@ checksum_tests()
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> run_tests $ns1 $ns2 10.0.1.1
> - chk_csum_nr "checksum test 1 1"
> + chk_csum_nr 1
> fi
>
> # checksum test 0 1
> @@ -2086,7 +2099,7 @@ checksum_tests()
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> run_tests $ns1 $ns2 10.0.1.1
> - chk_csum_nr "checksum test 0 1"
> + chk_csum_nr 1
> fi
>
> # checksum test 1 0
> @@ -2094,70 +2107,70 @@ checksum_tests()
> pm_nl_set_limits $ns1 0 1
> pm_nl_set_limits $ns2 0 1
> run_tests $ns1 $ns2 10.0.1.1
> - chk_csum_nr "checksum test 1 0"
> + chk_csum_nr 1
> fi
> }
>
> deny_join_id0_tests()
> {
> # subflow allow join id0 ns1
> - if reset_with_allow_join_id0 1 0; then
> + if reset_with_allow_join_id0 "single subflow allow join id0 ns1" 1 0; then
> pm_nl_set_limits $ns1 1 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow allow join id0 ns1" 1 1 1
> + chk_join_nr 1 1 1
> fi
>
> # subflow allow join id0 ns2
> - if reset_with_allow_join_id0 0 1; then
> + if reset_with_allow_join_id0 "single subflow allow join id0 ns2" 0 1; then
> pm_nl_set_limits $ns1 1 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "single subflow allow join id0 ns2" 0 0 0
> + chk_join_nr 0 0 0
> fi
>
> # signal address allow join id0 ns1
> # ADD_ADDRs are not affected by allow_join_id0 value.
> - if reset_with_allow_join_id0 1 0; then
> + if reset_with_allow_join_id0 "signal address allow join id0 ns1" 1 0; then
> pm_nl_set_limits $ns1 1 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal address allow join id0 ns1" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # signal address allow join id0 ns2
> # ADD_ADDRs are not affected by allow_join_id0 value.
> - if reset_with_allow_join_id0 0 1; then
> + if reset_with_allow_join_id0 "signal address allow join id0 ns2" 0 1; then
> pm_nl_set_limits $ns1 1 1
> pm_nl_set_limits $ns2 1 1
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "signal address allow join id0 ns2" 1 1 1
> + chk_join_nr 1 1 1
> chk_add_nr 1 1
> fi
>
> # subflow and address allow join id0 ns1
> - if reset_with_allow_join_id0 1 0; then
> + if reset_with_allow_join_id0 "subflow and address allow join id0 1" 1 0; then
> pm_nl_set_limits $ns1 2 2
> pm_nl_set_limits $ns2 2 2
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "subflow and address allow join id0 1" 2 2 2
> + chk_join_nr 2 2 2
> fi
>
> # subflow and address allow join id0 ns2
> - if reset_with_allow_join_id0 0 1; then
> + if reset_with_allow_join_id0 "subflow and address allow join id0 2" 0 1; then
> pm_nl_set_limits $ns1 2 2
> pm_nl_set_limits $ns2 2 2
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "subflow and address allow join id0 2" 1 1 1
> + chk_join_nr 1 1 1
> fi
> }
>
> @@ -2166,37 +2179,37 @@ fullmesh_tests()
> # fullmesh 1
> # 2 fullmesh addrs in ns2, added before the connection,
> # 1 non-fullmesh addr in ns1, added during the connection.
> - if reset; then
> + if reset "fullmesh test 2x1"; then
> pm_nl_set_limits $ns1 0 4
> pm_nl_set_limits $ns2 1 4
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh
> pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh
> run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
> - chk_join_nr "fullmesh test 2x1" 4 4 4
> + chk_join_nr 4 4 4
> chk_add_nr 1 1
> fi
>
> # fullmesh 2
> # 1 non-fullmesh addr in ns1, added before the connection,
> # 1 fullmesh addr in ns2, added during the connection.
> - if reset; then
> + if reset "fullmesh test 1x1"; then
> pm_nl_set_limits $ns1 1 3
> pm_nl_set_limits $ns2 1 3
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow
> - chk_join_nr "fullmesh test 1x1" 3 3 3
> + chk_join_nr 3 3 3
> chk_add_nr 1 1
> fi
>
> # fullmesh 3
> # 1 non-fullmesh addr in ns1, added before the connection,
> # 2 fullmesh addrs in ns2, added during the connection.
> - if reset; then
> + if reset "fullmesh test 1x2"; then
> pm_nl_set_limits $ns1 2 5
> pm_nl_set_limits $ns2 1 5
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
> - chk_join_nr "fullmesh test 1x2" 5 5 5
> + chk_join_nr 5 5 5
> chk_add_nr 1 1
> fi
>
> @@ -2204,53 +2217,53 @@ fullmesh_tests()
> # 1 non-fullmesh addr in ns1, added before the connection,
> # 2 fullmesh addrs in ns2, added during the connection,
> # limit max_subflows to 4.
> - if reset; then
> + if reset "fullmesh test 1x2, limited"; then
> pm_nl_set_limits $ns1 2 4
> pm_nl_set_limits $ns2 1 4
> pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow
> - chk_join_nr "fullmesh test 1x2, limited" 4 4 4
> + chk_join_nr 4 4 4
> chk_add_nr 1 1
> fi
>
> # set fullmesh flag
> - if reset; then
> + if reset "set fullmesh flag test"; then
> pm_nl_set_limits $ns1 4 4
> pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
> pm_nl_set_limits $ns2 4 4
> run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh
> - chk_join_nr "set fullmesh flag test" 2 2 2
> + chk_join_nr 2 2 2
> chk_rm_nr 0 1
> fi
>
> # set nofullmesh flag
> - if reset; then
> + if reset "set nofullmesh flag test"; then
> pm_nl_set_limits $ns1 4 4
> pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh
> pm_nl_set_limits $ns2 4 4
> run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh
> - chk_join_nr "set nofullmesh flag test" 2 2 2
> + chk_join_nr 2 2 2
> chk_rm_nr 0 1
> fi
>
> # set backup,fullmesh flags
> - if reset; then
> + if reset "set backup,fullmesh flags test"; then
> pm_nl_set_limits $ns1 4 4
> pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
> pm_nl_set_limits $ns2 4 4
> run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow backup,fullmesh
> - chk_join_nr "set backup,fullmesh flags test" 2 2 2
> + chk_join_nr 2 2 2
> chk_prio_nr 0 1
> chk_rm_nr 0 1
> fi
>
> # set nobackup,nofullmesh flags
> - if reset; then
> + if reset "set nobackup,nofullmesh flags test"; then
> pm_nl_set_limits $ns1 4 4
> pm_nl_set_limits $ns2 4 4
> pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup,nofullmesh
> - chk_join_nr "set nobackup,nofullmesh flags test" 2 2 2
> + chk_join_nr 2 2 2
> chk_prio_nr 0 1
> chk_rm_nr 0 1
> fi
> @@ -2259,67 +2272,67 @@ fullmesh_tests()
> userspace_tests()
> {
> # userspace pm type prevents add_addr
> - if reset; then
> + if reset "userspace pm type prevents add_addr"; then
> ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
> ip netns exec $ns1 ./pm_nl_ctl limits 0 2
> ip netns exec $ns2 ./pm_nl_ctl limits 0 2
> ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "userspace pm type prevents add_addr" 0 0 0
> + chk_join_nr 0 0 0
> chk_add_nr 0 0
> fi
>
> # userspace pm type echoes add_addr
> - if reset; then
> + if reset "userspace pm type echoes add_addr"; then
> ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
> ip netns exec $ns1 ./pm_nl_ctl limits 0 2
> ip netns exec $ns2 ./pm_nl_ctl limits 0 2
> ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "userspace pm type echoes add_addr" 0 0 0
> + chk_join_nr 0 0 0
> chk_add_nr 1 1
> fi
>
> # userspace pm type rejects join
> - if reset; then
> + if reset "userspace pm type rejects join"; then
> ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
> ip netns exec $ns1 ./pm_nl_ctl limits 1 1
> ip netns exec $ns2 ./pm_nl_ctl limits 1 1
> ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "userspace pm type rejects join" 1 1 0
> + chk_join_nr 1 1 0
> fi
>
> # userspace pm type does not send join
> - if reset; then
> + if reset "userspace pm type does not send join"; then
> ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
> ip netns exec $ns1 ./pm_nl_ctl limits 1 1
> ip netns exec $ns2 ./pm_nl_ctl limits 1 1
> ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1
> - chk_join_nr "userspace pm type does not send join" 0 0 0
> + chk_join_nr 0 0 0
> fi
>
> # userspace pm type prevents mp_prio
> - if reset; then
> + if reset "userspace pm type prevents mp_prio"; then
> ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
> ip netns exec $ns1 ./pm_nl_ctl limits 1 1
> ip netns exec $ns2 ./pm_nl_ctl limits 1 1
> ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
> - chk_join_nr "userspace pm type prevents mp_prio" 1 1 0
> + chk_join_nr 1 1 0
> chk_prio_nr 0 0
> fi
>
> # userspace pm type prevents rm_addr
> - if reset; then
> + if reset "userspace pm type prevents rm_addr"; then
> ip netns exec $ns1 sysctl -q net.mptcp.pm_type=1
> ip netns exec $ns2 sysctl -q net.mptcp.pm_type=1
> ip netns exec $ns1 ./pm_nl_ctl limits 0 1
> ip netns exec $ns2 ./pm_nl_ctl limits 0 1
> ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
> run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow
> - chk_join_nr "userspace pm type prevents rm_addr" 0 0 0
> + chk_join_nr 0 0 0
> chk_rm_nr 0 0
> fi
> }
> @@ -2344,7 +2357,7 @@ usage()
> echo " -i use ip mptcp"
> echo " -h help"
>
> - echo "[test ids]"
> + echo "[test ids|names]"
>
> exit ${ret}
> }
> @@ -2409,9 +2422,9 @@ shift $((OPTIND - 1))
>
> for arg in "${@}"; do
> if [[ "${arg}" =~ ^[0-9]+$ ]]; then
> - only_tests+=("${arg}")
> + only_tests_ids+=("${arg}")
> else
> - usage "Unknown argument: ${arg}"
> + only_tests_names+=("${arg}")
> fi
> done
>
> --
> 2.34.1
>
>
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH mptcp-next v2 5/9] selftests: mptcp: join: alt. to exec specific tests
2022-02-18 0:35 ` Mat Martineau
@ 2022-02-18 10:40 ` Matthieu Baerts
2022-02-18 18:29 ` Mat Martineau
0 siblings, 1 reply; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-18 10:40 UTC (permalink / raw)
To: Mat Martineau; +Cc: mptcp
Hi Mat,
On 18/02/2022 01:35, Mat Martineau wrote:
> On Thu, 17 Feb 2022, Matthieu Baerts wrote:
>
>> Running a specific test by giving the ID is often what we want: the CI
>> reports an issue with the Nth test, it is reproduceable with
(should be "reproducible")
>> ./mptcp_join.sh N
>>
>> But this doesn't work when a test is unstable and it is needed to find
>> since when it is unstable because the ID is a counter and new tests can
>> be added before changing the ID of a specific test.
>>
>
> Could you rephrase or split up this sentence to make it easier to parse?
Wow, I was really tired when I wrote and even reviewed that :)
I hope the following text is better:
But this might not work when there is a need to find which commit has
introduced a regression making a test unstable: failing from time to
time. Indeed, a specific test is not attached to one ID: the ID is in
fact a counter. It means the same test can have a different ID if other
tests have been added/removed before this unstable one.
>
>> Remembering the current test can also help listing failed tests at the
>> end.
>>
>> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH mptcp-next v2 5/9] selftests: mptcp: join: alt. to exec specific tests
2022-02-18 10:40 ` Matthieu Baerts
@ 2022-02-18 18:29 ` Mat Martineau
0 siblings, 0 replies; 19+ messages in thread
From: Mat Martineau @ 2022-02-18 18:29 UTC (permalink / raw)
To: Matthieu Baerts; +Cc: mptcp
On Fri, 18 Feb 2022, Matthieu Baerts wrote:
> Hi Mat,
>
> On 18/02/2022 01:35, Mat Martineau wrote:
>> On Thu, 17 Feb 2022, Matthieu Baerts wrote:
>>
>>> Running a specific test by giving the ID is often what we want: the CI
>>> reports an issue with the Nth test, it is reproduceable with
>
> (should be "reproducible")
>
>>> ./mptcp_join.sh N
>>>
>>> But this doesn't work when a test is unstable and it is needed to find
>>> since when it is unstable because the ID is a counter and new tests can
>>> be added before changing the ID of a specific test.
>>>
>>
>> Could you rephrase or split up this sentence to make it easier to parse?
>
> Wow, I was really tired when I wrote and even reviewed that :)
>
> I hope the following text is better:
>
> But this might not work when there is a need to find which commit has
> introduced a regression making a test unstable: failing from time to
> time. Indeed, a specific test is not attached to one ID: the ID is in
> fact a counter. It means the same test can have a different ID if other
> tests have been added/removed before this unstable one.
>
Yes, that works!
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH mptcp-next v2 6/9] selftests: mptcp: join: list failure at the end
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
` (4 preceding siblings ...)
2022-02-17 17:43 ` [PATCH mptcp-next v2 5/9] selftests: mptcp: join: alt. to exec " Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 7/9] selftests: mptcp: join: clarify local/global vars Matthieu Baerts
` (3 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
With ~100 tests, it helps to have this summary at the end not to scroll
to find which one has failed.
It is especially interseting when looking at the output produced by the
CI where the kernel logs from the serial are mixed together.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 77 ++++++++++++-------
1 file changed, 51 insertions(+), 26 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index de701de19219..346fdae1f876 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -22,6 +22,7 @@ init=0
declare -A all_tests
declare -a only_tests_ids
declare -a only_tests_names
+declare -A failed_tests
TEST_COUNT=0
TEST_NAME=""
nr_blank=40
@@ -249,6 +250,21 @@ reset_with_allow_join_id0()
ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=$ns2_enable
}
+fail_test()
+{
+ ret=1
+ failed_tests[${TEST_COUNT}]="${TEST_NAME}"
+}
+
+get_failed_tests_ids()
+{
+ # sorted
+ local i
+ for i in "${!failed_tests[@]}"; do
+ echo "${i}"
+ done | sort -n
+}
+
print_file_err()
{
ls -l "$1" 1>&2
@@ -270,7 +286,7 @@ check_transfer()
echo "[ FAIL ] $what does not match (in, out):"
print_file_err "$in"
print_file_err "$out"
- ret=1
+ fail_test
return 1
else
@@ -290,7 +306,7 @@ do_ping()
ip netns exec ${connector_ns} ping -q -c 1 $connect_addr >/dev/null
if [ $? -ne 0 ] ; then
echo "$listener_ns -> $connect_addr connectivity [ FAIL ]" 1>&2
- ret=1
+ fail_test
fi
}
@@ -691,7 +707,7 @@ do_transfer()
cat /tmp/${connector_ns}.out
cat "$capout"
- ret=1
+ fail_test
return 1
fi
@@ -793,7 +809,7 @@ chk_csum_nr()
[ -z "$count" ] && count=0
if [ "$count" != 0 ]; then
echo "[fail] got $count data checksum error[s] expected 0"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -803,7 +819,7 @@ chk_csum_nr()
[ -z "$count" ] && count=0
if [ "$count" != 0 ]; then
echo "[fail] got $count data checksum error[s] expected 0"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -823,7 +839,7 @@ chk_fail_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$mp_fail_nr_tx" ]; then
echo "[fail] got $count MP_FAIL[s] TX expected $mp_fail_nr_tx"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -834,7 +850,7 @@ chk_fail_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$mp_fail_nr_rx" ]; then
echo "[fail] got $count MP_FAIL[s] RX expected $mp_fail_nr_rx"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -855,7 +871,7 @@ chk_infi_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$mp_infi_nr_tx" ]; then
echo "[fail] got $count infinite map[s] TX expected $mp_infi_nr_tx"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -866,7 +882,7 @@ chk_infi_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$mp_infi_nr_rx" ]; then
echo "[fail] got $count infinite map[s] RX expected $mp_infi_nr_rx"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -889,7 +905,7 @@ chk_join_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$syn_nr" ]; then
echo "[fail] got $count JOIN[s] syn expected $syn_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -907,7 +923,7 @@ chk_join_nr()
echo -n "[ ok ]"
else
echo "[fail] got $count JOIN[s] synack expected $syn_ack_nr"
- ret=1
+ fail_test
dump_stats=1
fi
else
@@ -919,7 +935,7 @@ chk_join_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$ack_nr" ]; then
echo "[fail] got $count JOIN[s] ack expected $ack_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -959,7 +975,7 @@ chk_stale_nr()
echo "[fail] got $stale_nr stale[s] $recover_nr recover[s], " \
" expected stale in range [$stale_min..$stale_max]," \
" stale-recover delta $stale_delta "
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -996,7 +1012,7 @@ chk_add_nr()
# add addrs options, due to retransmissions
if [ "$count" != "$add_nr" ] && [ "$timeout" -gt 1 -o "$count" -lt "$add_nr" ]; then
echo "[fail] got $count ADD_ADDR[s] expected $add_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -1007,7 +1023,7 @@ chk_add_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$echo_nr" ]; then
echo "[fail] got $count ADD_ADDR echo[s] expected $echo_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -1019,7 +1035,7 @@ chk_add_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$port_nr" ]; then
echo "[fail] got $count ADD_ADDR[s] with a port-number expected $port_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -1032,7 +1048,7 @@ chk_add_nr()
if [ "$count" != "$syn_nr" ]; then
echo "[fail] got $count JOIN[s] syn with a different \
port-number expected $syn_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -1045,7 +1061,7 @@ chk_add_nr()
if [ "$count" != "$syn_ack_nr" ]; then
echo "[fail] got $count JOIN[s] synack with a different \
port-number expected $syn_ack_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -1058,7 +1074,7 @@ chk_add_nr()
if [ "$count" != "$ack_nr" ]; then
echo "[fail] got $count JOIN[s] ack with a different \
port-number expected $ack_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -1071,7 +1087,7 @@ chk_add_nr()
if [ "$count" != "$mis_syn_nr" ]; then
echo "[fail] got $count JOIN[s] syn with a mismatched \
port-number expected $mis_syn_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -1084,7 +1100,7 @@ chk_add_nr()
if [ "$count" != "$mis_ack_nr" ]; then
echo "[fail] got $count JOIN[s] ack with a mismatched \
port-number expected $mis_ack_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -1119,7 +1135,7 @@ chk_rm_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$rm_addr_nr" ]; then
echo "[fail] got $count RM_ADDR[s] expected $rm_addr_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -1130,7 +1146,7 @@ chk_rm_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$rm_subflow_nr" ]; then
echo "[fail] got $count RM_SUBFLOW[s] expected $rm_subflow_nr"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -1151,7 +1167,7 @@ chk_prio_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$mp_prio_nr_tx" ]; then
echo "[fail] got $count MP_PRIO[s] TX expected $mp_prio_nr_tx"
- ret=1
+ fail_test
dump_stats=1
else
echo -n "[ ok ]"
@@ -1162,7 +1178,7 @@ chk_prio_nr()
[ -z "$count" ] && count=0
if [ "$count" != "$mp_prio_nr_rx" ]; then
echo "[fail] got $count MP_PRIO[s] RX expected $mp_prio_nr_rx"
- ret=1
+ fail_test
dump_stats=1
else
echo "[ ok ]"
@@ -1186,7 +1202,7 @@ chk_link_usage()
if [ $tx_rate -lt $((expected_rate - $tolerance)) -o \
$tx_rate -gt $((expected_rate + $tolerance)) ]; then
echo "[fail] got $tx_rate% usage, expected $expected_rate%"
- ret=1
+ fail_test
else
echo "[ ok ]"
fi
@@ -2436,4 +2452,13 @@ for subtests in "${tests[@]}"; do
"${subtests}"
done
+if [ ${ret} -ne 0 ]; then
+ echo
+ echo "${#failed_tests[@]} failure(s) has(ve) been detected:"
+ for i in $(get_failed_tests_ids); do
+ echo -e "\t- ${i}: ${failed_tests[${i}]}"
+ done
+ echo
+fi
+
exit $ret
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH mptcp-next v2 7/9] selftests: mptcp: join: clarify local/global vars
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
` (5 preceding siblings ...)
2022-02-17 17:43 ` [PATCH mptcp-next v2 6/9] selftests: mptcp: join: list failure at the end Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 8/9] selftests: mptcp: join: avoid backquotes Matthieu Baerts
` (2 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
Some vars are redefined in different places. Best to avoid this
classical Bash pitfall where variables are accidentally overridden by
other functions because the proper scope has not been defined.
Most issues are with loops: typically 'i' is used in for-loops but if it
is not global, calling a function from a for-loop also doing a for-loop
with the same non local 'i' variable causes troubles because the first
'i' will be assigned to another value. To prevent such issues, the
iterator variable is now declared as local just before the loop. If it
is always done like this, issues are avoided.
To distinct between local and non local variables, all non local ones
are defined at the beginning of the script. The others are now defined
with the "local" keyword.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
Notes:
v2:
- non local variables no longer have capital letter: this can be useful but
create a lot of modifications everywhere, making backports harders.
- add missing local
- explicitly define a 'local' with the iterator before 'for' and 'while' loops
.../testing/selftests/net/mptcp/mptcp_join.sh | 135 +++++++++++-------
1 file changed, 83 insertions(+), 52 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 346fdae1f876..ccd7d900c9f1 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -9,6 +9,9 @@ cin=""
cinfail=""
cinsent=""
cout=""
+capout=""
+ns1=""
+ns2=""
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
@@ -51,12 +54,14 @@ init_partial()
{
capout=$(mktemp)
+ local rndh
rndh=$(mktemp -u XXXXXX)
ns1="ns1-$rndh"
ns2="ns2-$rndh"
- for netns in "$ns1" "$ns2";do
+ local netns
+ for netns in "$ns1" "$ns2"; do
ip netns add $netns || exit $ksft_skip
ip -net $netns link set lo up
ip netns exec $netns sysctl -q net.mptcp.enabled=1
@@ -77,6 +82,7 @@ init_partial()
# ns1eth3 ns2eth3
# ns1eth4 ns2eth4
+ local i
for i in `seq 1 4`; do
ip link add ns1eth$i netns "$ns1" type veth peer name ns2eth$i netns "$ns2"
ip -net "$ns1" addr add 10.0.$i.1/24 dev ns1eth$i
@@ -95,6 +101,7 @@ init_partial()
init_shapers()
{
+ local i
for i in `seq 1 4`; do
tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1
tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1
@@ -105,6 +112,7 @@ cleanup_partial()
{
rm -f "$capout"
+ local netns
for netns in "$ns1" "$ns2"; do
ip netns del $netns
rm -f /tmp/$netns.{nstat,out}
@@ -201,7 +209,8 @@ reset_with_cookies()
{
reset "${1}" || return 1
- for netns in "$ns1" "$ns2";do
+ local netns
+ for netns in "$ns1" "$ns2"; do
ip netns exec $netns sysctl -q net.ipv4.tcp_syncookies=2
done
}
@@ -274,10 +283,11 @@ print_file_err()
check_transfer()
{
- in=$1
- out=$2
- what=$3
+ local in=$1
+ local out=$2
+ local what=$3
+ local line
cmp -l "$in" "$out" | while read line; do
local arr=($line)
@@ -299,9 +309,9 @@ check_transfer()
do_ping()
{
- listener_ns="$1"
- connector_ns="$2"
- connect_addr="$3"
+ local listener_ns="$1"
+ local connector_ns="$2"
+ local connect_addr="$3"
ip netns exec ${connector_ns} ping -q -c 1 $connect_addr >/dev/null
if [ $? -ne 0 ] ; then
@@ -312,15 +322,16 @@ do_ping()
link_failure()
{
- ns="$1"
+ local ns="$1"
if [ -z "$FAILING_LINKS" ]; then
l=$((RANDOM%4))
FAILING_LINKS=$((l+1))
fi
+ local l
for l in $FAILING_LINKS; do
- veth="ns1eth$l"
+ local veth="ns1eth$l"
ip -net "$ns" link set "$veth" down
done
}
@@ -337,9 +348,10 @@ wait_local_port_listen()
local listener_ns="${1}"
local port="${2}"
- local port_hex i
-
+ local port_hex
port_hex="$(printf "%04X" "${port}")"
+
+ local i
for i in $(seq 10); do
ip netns exec "${listener_ns}" cat /proc/net/tcp* | \
awk "BEGIN {rc=1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) {rc=0; exit}} END {exit rc}" &&
@@ -350,7 +362,7 @@ wait_local_port_listen()
rm_addr_count()
{
- ns=${1}
+ local ns=${1}
ip netns exec ${ns} nstat -as | grep MPTcpExtRmAddr | awk '{print $2}'
}
@@ -361,8 +373,8 @@ wait_rm_addr()
local ns="${1}"
local old_cnt="${2}"
local cnt
- local i
+ local i
for i in $(seq 10); do
cnt=$(rm_addr_count ${ns})
[ "$cnt" = "${old_cnt}" ] || break
@@ -387,12 +399,13 @@ pm_nl_add_endpoint()
{
local ns=$1
local addr=$2
- local flags
- local port
- local dev
- local id
+ local flags _flags
+ local port _port
+ local dev _dev
+ local id _id
local nr=2
+ local p
for p in $@
do
if [ $p = "flags" ]; then
@@ -472,24 +485,26 @@ pm_nl_change_endpoint()
do_transfer()
{
- listener_ns="$1"
- connector_ns="$2"
- cl_proto="$3"
- srv_proto="$4"
- connect_addr="$5"
- test_link_fail="$6"
- addr_nr_ns1="$7"
- addr_nr_ns2="$8"
- speed="$9"
- sflags="${10}"
-
- port=$((10000+$TEST_COUNT-1))
+ local listener_ns="$1"
+ local connector_ns="$2"
+ local cl_proto="$3"
+ local srv_proto="$4"
+ local connect_addr="$5"
+ local test_link_fail="$6"
+ local addr_nr_ns1="$7"
+ local addr_nr_ns2="$8"
+ local speed="$9"
+ local sflags="${10}"
+
+ local port=$((10000 + TEST_COUNT - 1))
+ local cappid
:> "$cout"
:> "$sout"
:> "$capout"
if [ $capture -eq 1 ]; then
+ local capuser
if [ -z $SUDO_USER ] ; then
capuser=""
else
@@ -536,7 +551,7 @@ do_transfer()
$mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \
${local_addr} < "$sin" > "$sout" &
fi
- spid=$!
+ local spid=$!
wait_local_port_listen "${listener_ns}" "${port}"
@@ -553,15 +568,16 @@ do_transfer()
$mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
$connect_addr > "$cout" &
fi
- cpid=$!
+ local cpid=$!
# let the mptcp subflow be established in background before
# do endpoint manipulation
[ $addr_nr_ns1 = "0" -a $addr_nr_ns2 = "0" ] || sleep 1
if [ $addr_nr_ns1 -gt 0 ]; then
+ local counter=2
+ local add_nr_ns1
let add_nr_ns1=addr_nr_ns1
- counter=2
while [ $add_nr_ns1 -gt 0 ]; do
local addr
if is_v6 "${connect_addr}"; then
@@ -574,13 +590,16 @@ do_transfer()
let add_nr_ns1-=1
done
elif [ $addr_nr_ns1 -lt 0 ]; then
+ local rm_nr_ns1
let rm_nr_ns1=-addr_nr_ns1
if [ $rm_nr_ns1 -lt 8 ]; then
- counter=0
+ local counter=0
+ local line
pm_nl_show_endpoints ${listener_ns} | while read line; do
local arr=($line)
local nr=0
+ local i
for i in ${arr[@]}; do
if [ $i = "id" ]; then
if [ $counter -eq $rm_nr_ns1 ]; then
@@ -602,7 +621,7 @@ do_transfer()
fi
fi
- flags="subflow"
+ local flags="subflow"
if [[ "${addr_nr_ns2}" = "fullmesh_"* ]]; then
flags="${flags},fullmesh"
addr_nr_ns2=${addr_nr_ns2:9}
@@ -613,8 +632,9 @@ do_transfer()
[ $addr_nr_ns1 -gt 0 -a $addr_nr_ns2 -lt 0 ] && sleep 1
if [ $addr_nr_ns2 -gt 0 ]; then
+ local add_nr_ns2
let add_nr_ns2=addr_nr_ns2
- counter=3
+ local counter=3
while [ $add_nr_ns2 -gt 0 ]; do
local addr
if is_v6 "${connect_addr}"; then
@@ -627,18 +647,21 @@ do_transfer()
let add_nr_ns2-=1
done
elif [ $addr_nr_ns2 -lt 0 ]; then
- let rm_nr_ns2=-addr_nr_ns2
+ local rm_nr_ns2
if [ $rm_nr_ns2 -lt 8 ]; then
- counter=0
+ local counter=0
+ local line
pm_nl_show_endpoints ${connector_ns} | while read line; do
local arr=($line)
local nr=0
+ local i
for i in ${arr[@]}; do
if [ $i = "id" ]; then
if [ $counter -eq $rm_nr_ns2 ]; then
break
fi
+ local id rm_addr
# rm_addr are serialized, allow the previous one to
# complete
id=${arr[$nr+1]}
@@ -665,12 +688,16 @@ do_transfer()
if [ ! -z $sflags ]; then
sleep 1
+
+ local netns
for netns in "$ns1" "$ns2"; do
+ local line
pm_nl_show_endpoints $netns | while read line; do
local arr=($line)
local nr=0
local id
+ local i
for i in ${arr[@]}; do
if [ $i = "id" ]; then
id=${arr[$nr+1]}
@@ -683,9 +710,9 @@ do_transfer()
fi
wait $cpid
- retc=$?
+ local retc=$?
wait $spid
- rets=$?
+ local rets=$?
if [ $capture -eq 1 ]; then
sleep 1
@@ -735,9 +762,9 @@ do_transfer()
make_file()
{
- name=$1
- who=$2
- size=$3
+ local name=$1
+ local who=$2
+ local size=$3
dd if=/dev/urandom of="$name" bs=1024 count=$size 2> /dev/null
echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name"
@@ -747,14 +774,16 @@ make_file()
run_tests()
{
- listener_ns="$1"
- connector_ns="$2"
- connect_addr="$3"
- test_linkfail="${4:-0}"
- addr_nr_ns1="${5:-0}"
- addr_nr_ns2="${6:-0}"
- speed="${7:-fast}"
- sflags="${8:-""}"
+ local listener_ns="$1"
+ local connector_ns="$2"
+ local connect_addr="$3"
+ local test_linkfail="${4:-0}"
+ local addr_nr_ns1="${5:-0}"
+ local addr_nr_ns2="${6:-0}"
+ local speed="${7:-fast}"
+ local sflags="${8:-""}"
+
+ local size
# create the input file for the failure test when
# the first failure test run
@@ -1215,7 +1244,9 @@ wait_attempt_fail()
local ns=$1
while [ $time -lt $timeout_ms ]; do
- local cnt=$(ip netns exec $ns nstat -as TcpAttemptFails | grep TcpAttemptFails | awk '{print $2}')
+ local cnt
+
+ cnt=$(ip netns exec $ns nstat -as TcpAttemptFails | grep TcpAttemptFails | awk '{print $2}')
[ "$cnt" = 1 ] && return 1
time=$((time + 100))
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH mptcp-next v2 8/9] selftests: mptcp: join: avoid backquotes
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
` (6 preceding siblings ...)
2022-02-17 17:43 ` [PATCH mptcp-next v2 7/9] selftests: mptcp: join: clarify local/global vars Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-17 17:43 ` [PATCH mptcp-next v2 9/9] selftests: mptcp: join: make it shellcheck compliant Matthieu Baerts
2022-02-18 0:33 ` [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Mat Martineau
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
As explained on ShellCheck's wiki [1], it is recommended to avoid
backquotes `...` in favour of parenthesis $(...):
> Backtick command substitution `...` is legacy syntax with several
> issues.
>
> - It has a series of undefined behaviors related to quoting in POSIX.
> - It imposes a custom escaping mode with surprising results.
> - It's exceptionally hard to nest.
>
> $(...) command substitution has none of these problems, and is
> therefore strongly encouraged.
[1] https://www.shellcheck.net/wiki/SC2006
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 70 ++++++++++---------
1 file changed, 36 insertions(+), 34 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index ccd7d900c9f1..78d8bc1beb25 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -83,7 +83,7 @@ init_partial()
# ns1eth4 ns2eth4
local i
- for i in `seq 1 4`; do
+ for i in $(seq 1 4); do
ip link add ns1eth$i netns "$ns1" type veth peer name ns2eth$i netns "$ns2"
ip -net "$ns1" addr add 10.0.$i.1/24 dev ns1eth$i
ip -net "$ns1" addr add dead:beef:$i::1/64 dev ns1eth$i nodad
@@ -102,7 +102,7 @@ init_partial()
init_shapers()
{
local i
- for i in `seq 1 4`; do
+ for i in $(seq 1 4); do
tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1
tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1
done
@@ -834,7 +834,7 @@ chk_csum_nr()
echo -n " "
fi
printf " %-36s %s" "$msg" "sum"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != 0 ]; then
echo "[fail] got $count data checksum error[s] expected 0"
@@ -844,7 +844,7 @@ chk_csum_nr()
echo -n "[ ok ]"
fi
echo -n " - csum "
- count=`ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}'`
+ count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != 0 ]; then
echo "[fail] got $count data checksum error[s] expected 0"
@@ -864,7 +864,7 @@ chk_fail_nr()
local dump_stats
printf "%-${nr_blank}s %s" " " "ftx"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mp_fail_nr_tx" ]; then
echo "[fail] got $count MP_FAIL[s] TX expected $mp_fail_nr_tx"
@@ -875,7 +875,7 @@ chk_fail_nr()
fi
echo -n " - frx "
- count=`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFailRx | awk '{print $2}'`
+ count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtMPFailRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mp_fail_nr_rx" ]; then
echo "[fail] got $count MP_FAIL[s] RX expected $mp_fail_nr_rx"
@@ -896,7 +896,7 @@ chk_infi_nr()
local dump_stats
printf "%-${nr_blank}s %s" " " "itx"
- count=`ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print $2}'`
+ count=$(ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mp_infi_nr_tx" ]; then
echo "[fail] got $count infinite map[s] TX expected $mp_infi_nr_tx"
@@ -907,7 +907,7 @@ chk_infi_nr()
fi
echo -n " - irx "
- count=`ip netns exec $ns1 nstat -as | grep InfiniteMapRx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep InfiniteMapRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mp_infi_nr_rx" ]; then
echo "[fail] got $count infinite map[s] RX expected $mp_infi_nr_rx"
@@ -930,7 +930,7 @@ chk_join_nr()
local with_cookie
printf "%03u %-36s %s" "${TEST_COUNT}" "${TEST_NAME}" "syn"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinSynRx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinSynRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$syn_nr" ]; then
echo "[fail] got $count JOIN[s] syn expected $syn_nr"
@@ -941,8 +941,8 @@ chk_join_nr()
fi
echo -n " - synack"
- with_cookie=`ip netns exec $ns2 sysctl -n net.ipv4.tcp_syncookies`
- count=`ip netns exec $ns2 nstat -as | grep MPTcpExtMPJoinSynAckRx | awk '{print $2}'`
+ with_cookie=$(ip netns exec $ns2 sysctl -n net.ipv4.tcp_syncookies)
+ count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtMPJoinSynAckRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$syn_ack_nr" ]; then
# simult connections exceeding the limit with cookie enabled could go up to
@@ -960,7 +960,7 @@ chk_join_nr()
fi
echo -n " - ack"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinAckRx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinAckRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$ack_nr" ]; then
echo "[fail] got $count JOIN[s] ack expected $ack_nr"
@@ -993,9 +993,9 @@ chk_stale_nr()
local recover_nr
printf "%-${nr_blank}s %-18s" " " "stale"
- stale_nr=`ip netns exec $ns nstat -as | grep MPTcpExtSubflowStale | awk '{print $2}'`
+ stale_nr=$(ip netns exec $ns nstat -as | grep MPTcpExtSubflowStale | awk '{print $2}')
[ -z "$stale_nr" ] && stale_nr=0
- recover_nr=`ip netns exec $ns nstat -as | grep MPTcpExtSubflowRecover | awk '{print $2}'`
+ recover_nr=$(ip netns exec $ns nstat -as | grep MPTcpExtSubflowRecover | awk '{print $2}')
[ -z "$recover_nr" ] && recover_nr=0
if [ $stale_nr -lt $stale_min ] ||
@@ -1031,10 +1031,10 @@ chk_add_nr()
local dump_stats
local timeout
- timeout=`ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout`
+ timeout=$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout)
printf "%-${nr_blank}s %s" " " "add"
- count=`ip netns exec $ns2 nstat -as MPTcpExtAddAddr | grep MPTcpExtAddAddr | awk '{print $2}'`
+ count=$(ip netns exec $ns2 nstat -as MPTcpExtAddAddr | grep MPTcpExtAddAddr | awk '{print $2}')
[ -z "$count" ] && count=0
# if the test configured a short timeout tolerate greater then expected
@@ -1048,7 +1048,7 @@ chk_add_nr()
fi
echo -n " - echo "
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtEchoAdd | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtEchoAdd | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$echo_nr" ]; then
echo "[fail] got $count ADD_ADDR echo[s] expected $echo_nr"
@@ -1060,7 +1060,7 @@ chk_add_nr()
if [ $port_nr -gt 0 ]; then
echo -n " - pt "
- count=`ip netns exec $ns2 nstat -as | grep MPTcpExtPortAdd | awk '{print $2}'`
+ count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtPortAdd | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$port_nr" ]; then
echo "[fail] got $count ADD_ADDR[s] with a port-number expected $port_nr"
@@ -1071,8 +1071,8 @@ chk_add_nr()
fi
printf "%-${nr_blank}s %s" " " "syn"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinPortSynRx |
- awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinPortSynRx |
+ awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$syn_nr" ]; then
echo "[fail] got $count JOIN[s] syn with a different \
@@ -1084,8 +1084,8 @@ chk_add_nr()
fi
echo -n " - synack"
- count=`ip netns exec $ns2 nstat -as | grep MPTcpExtMPJoinPortSynAckRx |
- awk '{print $2}'`
+ count=$(ip netns exec $ns2 nstat -as | grep MPTcpExtMPJoinPortSynAckRx |
+ awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$syn_ack_nr" ]; then
echo "[fail] got $count JOIN[s] synack with a different \
@@ -1097,8 +1097,8 @@ chk_add_nr()
fi
echo -n " - ack"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinPortAckRx |
- awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinPortAckRx |
+ awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$ack_nr" ]; then
echo "[fail] got $count JOIN[s] ack with a different \
@@ -1110,8 +1110,8 @@ chk_add_nr()
fi
printf "%-${nr_blank}s %s" " " "syn"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMismatchPortSynRx |
- awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMismatchPortSynRx |
+ awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mis_syn_nr" ]; then
echo "[fail] got $count JOIN[s] syn with a mismatched \
@@ -1123,8 +1123,8 @@ chk_add_nr()
fi
echo -n " - ack "
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMismatchPortAckRx |
- awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMismatchPortAckRx |
+ awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mis_ack_nr" ]; then
echo "[fail] got $count JOIN[s] ack with a mismatched \
@@ -1160,7 +1160,7 @@ chk_rm_nr()
fi
printf "%-${nr_blank}s %s" " " "rm "
- count=`ip netns exec $addr_ns nstat -as | grep MPTcpExtRmAddr | awk '{print $2}'`
+ count=$(ip netns exec $addr_ns nstat -as | grep MPTcpExtRmAddr | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$rm_addr_nr" ]; then
echo "[fail] got $count RM_ADDR[s] expected $rm_addr_nr"
@@ -1171,7 +1171,7 @@ chk_rm_nr()
fi
echo -n " - sf "
- count=`ip netns exec $subflow_ns nstat -as | grep MPTcpExtRmSubflow | awk '{print $2}'`
+ count=$(ip netns exec $subflow_ns nstat -as | grep MPTcpExtRmSubflow | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$rm_subflow_nr" ]; then
echo "[fail] got $count RM_SUBFLOW[s] expected $rm_subflow_nr"
@@ -1192,7 +1192,7 @@ chk_prio_nr()
local dump_stats
printf "%-${nr_blank}s %s" " " "ptx"
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioTx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioTx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mp_prio_nr_tx" ]; then
echo "[fail] got $count MP_PRIO[s] TX expected $mp_prio_nr_tx"
@@ -1203,7 +1203,7 @@ chk_prio_nr()
fi
echo -n " - prx "
- count=`ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioRx | awk '{print $2}'`
+ count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioRx | awk '{print $2}')
[ -z "$count" ] && count=0
if [ "$count" != "$mp_prio_nr_rx" ]; then
echo "[fail] got $count MP_PRIO[s] RX expected $mp_prio_nr_rx"
@@ -1222,8 +1222,10 @@ chk_link_usage()
local link=$2
local out=$3
local expected_rate=$4
- local tx_link=`ip netns exec $ns cat /sys/class/net/$link/statistics/tx_bytes`
- local tx_total=`ls -l $out | awk '{print $5}'`
+
+ local tx_link tx_total
+ tx_link=$(ip netns exec $ns cat /sys/class/net/$link/statistics/tx_bytes)
+ tx_total=$(ls -l $out | awk '{print $5}')
local tx_rate=$((tx_link * 100 / $tx_total))
local tolerance=5
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH mptcp-next v2 9/9] selftests: mptcp: join: make it shellcheck compliant
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
` (7 preceding siblings ...)
2022-02-17 17:43 ` [PATCH mptcp-next v2 8/9] selftests: mptcp: join: avoid backquotes Matthieu Baerts
@ 2022-02-17 17:43 ` Matthieu Baerts
2022-02-18 0:33 ` [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Mat Martineau
9 siblings, 0 replies; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-17 17:43 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts
This fixes a few issues reported by ShellCheck:
- SC2068: Double quote array expansions to avoid re-splitting elements.
- SC2206: Quote to prevent word splitting/globbing, or split robustly
with mapfile or read -a.
- SC2166: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.
- SC2155: Declare and assign separately to avoid masking return values.
- SC2162: read without -r will mangle backslashes.
- SC2219: Instead of 'let expr', prefer (( expr )) .
- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly
with $?.
- SC2236: Use -n instead of ! -z.
- SC2004: $/${} is unnecessary on arithmetic variables.
- SC2012: Use find instead of ls to better handle non-alphanumeric
filenames.
SC2086 (Double quotes to prevent globbing and word splitting) is ignored
because it is controlled for the moment and there are too many to
change.
While at it, also fixed the alignment in one comment.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 104 +++++++++---------
1 file changed, 55 insertions(+), 49 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 78d8bc1beb25..5ef06a2542f4 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1,6 +1,11 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0
+# Double quotes to prevent globbing and word splitting is recommended in new
+# code but we accept it, especially because there were too many before having
+# address all other issues detected by shellcheck.
+#shellcheck disable=SC2086
+
ret=0
sin=""
sinfail=""
@@ -76,7 +81,7 @@ init_partial()
check_invert=0
FAILING_LINKS=""
- # ns1 ns2
+ # ns1 ns2
# ns1eth1 ns2eth1
# ns1eth2 ns2eth2
# ns1eth3 ns2eth3
@@ -286,12 +291,11 @@ check_transfer()
local in=$1
local out=$2
local what=$3
+ local i a b
local line
- cmp -l "$in" "$out" | while read line; do
- local arr=($line)
-
- let sum=0${arr[1]}+0${arr[2]}
+ cmp -l "$in" "$out" | while read -r i a b; do
+ local sum=$((0${a} + 0${b}))
if [ $check_invert -eq 0 ] || [ $sum -ne $((0xff)) ]; then
echo "[ FAIL ] $what does not match (in, out):"
print_file_err "$in"
@@ -300,7 +304,7 @@ check_transfer()
return 1
else
- echo "$what has inverted byte at ${arr[0]}"
+ echo "$what has inverted byte at ${i}"
fi
done
@@ -313,8 +317,7 @@ do_ping()
local connector_ns="$2"
local connect_addr="$3"
- ip netns exec ${connector_ns} ping -q -c 1 $connect_addr >/dev/null
- if [ $? -ne 0 ] ; then
+ if ! ip netns exec ${connector_ns} ping -q -c 1 $connect_addr >/dev/null; then
echo "$listener_ns -> $connect_addr connectivity [ FAIL ]" 1>&2
fail_test
fi
@@ -406,26 +409,26 @@ pm_nl_add_endpoint()
local nr=2
local p
- for p in $@
+ for p in "${@}"
do
if [ $p = "flags" ]; then
eval _flags=\$"$nr"
- [ ! -z $_flags ]; flags="flags $_flags"
+ [ -n "$_flags" ]; flags="flags $_flags"
fi
if [ $p = "dev" ]; then
eval _dev=\$"$nr"
- [ ! -z $_dev ]; dev="dev $_dev"
+ [ -n "$_dev" ]; dev="dev $_dev"
fi
if [ $p = "id" ]; then
eval _id=\$"$nr"
- [ ! -z $_id ]; id="id $_id"
+ [ -n "$_id" ]; id="id $_id"
fi
if [ $p = "port" ]; then
eval _port=\$"$nr"
- [ ! -z $_port ]; port="port $_port"
+ [ -n "$_port" ]; port="port $_port"
fi
- let nr+=1
+ nr=$((nr + 1))
done
if [ $ip_mptcp -eq 1 ]; then
@@ -572,12 +575,13 @@ do_transfer()
# let the mptcp subflow be established in background before
# do endpoint manipulation
- [ $addr_nr_ns1 = "0" -a $addr_nr_ns2 = "0" ] || sleep 1
+ if [ $addr_nr_ns1 != "0" ] || [ $addr_nr_ns2 != "0" ]; then
+ sleep 1
+ fi
if [ $addr_nr_ns1 -gt 0 ]; then
local counter=2
- local add_nr_ns1
- let add_nr_ns1=addr_nr_ns1
+ local add_nr_ns1=${addr_nr_ns1}
while [ $add_nr_ns1 -gt 0 ]; do
local addr
if is_v6 "${connect_addr}"; then
@@ -586,21 +590,21 @@ do_transfer()
addr="10.0.$counter.1"
fi
pm_nl_add_endpoint $ns1 $addr flags signal
- let counter+=1
- let add_nr_ns1-=1
+ counter=$((counter + 1))
+ add_nr_ns1=$((add_nr_ns1 - 1))
done
elif [ $addr_nr_ns1 -lt 0 ]; then
- local rm_nr_ns1
- let rm_nr_ns1=-addr_nr_ns1
+ local rm_nr_ns1=$((-addr_nr_ns1))
if [ $rm_nr_ns1 -lt 8 ]; then
local counter=0
local line
- pm_nl_show_endpoints ${listener_ns} | while read line; do
+ pm_nl_show_endpoints ${listener_ns} | while read -r line; do
+ # shellcheck disable=SC2206 # we do want to split per word
local arr=($line)
local nr=0
local i
- for i in ${arr[@]}; do
+ for i in "${arr[@]}"; do
if [ $i = "id" ]; then
if [ $counter -eq $rm_nr_ns1 ]; then
break
@@ -609,9 +613,9 @@ do_transfer()
rm_addr=$(rm_addr_count ${connector_ns})
pm_nl_del_endpoint ${listener_ns} $id
wait_rm_addr ${connector_ns} ${rm_addr}
- let counter+=1
+ counter=$((counter + 1))
fi
- let nr+=1
+ nr=$((nr + 1))
done
done
elif [ $rm_nr_ns1 -eq 8 ]; then
@@ -629,11 +633,10 @@ do_transfer()
# if newly added endpoints must be deleted, give the background msk
# some time to created them
- [ $addr_nr_ns1 -gt 0 -a $addr_nr_ns2 -lt 0 ] && sleep 1
+ [ $addr_nr_ns1 -gt 0 ] && [ $addr_nr_ns2 -lt 0 ] && sleep 1
if [ $addr_nr_ns2 -gt 0 ]; then
- local add_nr_ns2
- let add_nr_ns2=addr_nr_ns2
+ local add_nr_ns2=${addr_nr_ns2}
local counter=3
while [ $add_nr_ns2 -gt 0 ]; do
local addr
@@ -643,20 +646,21 @@ do_transfer()
addr="10.0.$counter.2"
fi
pm_nl_add_endpoint $ns2 $addr flags $flags
- let counter+=1
- let add_nr_ns2-=1
+ counter=$((counter + 1))
+ add_nr_ns2=$((add_nr_ns2 - 1))
done
elif [ $addr_nr_ns2 -lt 0 ]; then
- local rm_nr_ns2
+ local rm_nr_ns2=$((-addr_nr_ns2))
if [ $rm_nr_ns2 -lt 8 ]; then
local counter=0
local line
- pm_nl_show_endpoints ${connector_ns} | while read line; do
+ pm_nl_show_endpoints ${connector_ns} | while read -r line; do
+ # shellcheck disable=SC2206 # we do want to split per word
local arr=($line)
local nr=0
local i
- for i in ${arr[@]}; do
+ for i in "${arr[@]}"; do
if [ $i = "id" ]; then
if [ $counter -eq $rm_nr_ns2 ]; then
break
@@ -668,9 +672,9 @@ do_transfer()
rm_addr=$(rm_addr_count ${listener_ns})
pm_nl_del_endpoint ${connector_ns} $id
wait_rm_addr ${listener_ns} ${rm_addr}
- let counter+=1
+ counter=$((counter + 1))
fi
- let nr+=1
+ nr=$((nr + 1))
done
done
elif [ $rm_nr_ns2 -eq 8 ]; then
@@ -686,23 +690,25 @@ do_transfer()
fi
fi
- if [ ! -z $sflags ]; then
+ if [ -n "${sflags}" ]; then
sleep 1
local netns
for netns in "$ns1" "$ns2"; do
local line
- pm_nl_show_endpoints $netns | while read line; do
+ pm_nl_show_endpoints $netns | while read -r line; do
+ # shellcheck disable=SC2206 # we do want to split per word
local arr=($line)
local nr=0
local id
+ local i
local i
- for i in ${arr[@]}; do
+ for i in "${arr[@]}"; do
if [ $i = "id" ]; then
id=${arr[$nr+1]}
fi
- let nr+=1
+ nr=$((nr + 1))
done
pm_nl_change_endpoint $netns $id $sflags
done
@@ -787,20 +793,20 @@ run_tests()
# create the input file for the failure test when
# the first failure test run
- if [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then
+ if [ "$test_linkfail" -ne 0 ] && [ -z "$cinfail" ]; then
# the client file must be considerably larger
# of the maximum expected cwin value, or the
# link utilization will be not predicable
size=$((RANDOM%2))
size=$((size+1))
size=$((size*8192))
- size=$((size + ( $RANDOM % 8192) ))
+ size=$((size + ( RANDOM % 8192) ))
cinfail=$(mktemp)
make_file "$cinfail" "client" $size
fi
- if [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then
+ if [ "$test_linkfail" -eq 2 ] && [ -z "$sinfail" ]; then
size=$((RANDOM%16))
size=$((size+1))
size=$((size*2048))
@@ -999,8 +1005,8 @@ chk_stale_nr()
[ -z "$recover_nr" ] && recover_nr=0
if [ $stale_nr -lt $stale_min ] ||
- [ $stale_max -gt 0 -a $stale_nr -gt $stale_max ] ||
- [ $((stale_nr - $recover_nr)) -ne $stale_delta ]; then
+ { [ $stale_max -gt 0 ] && [ $stale_nr -gt $stale_max ]; } ||
+ [ $((stale_nr - recover_nr)) -ne $stale_delta ]; then
echo "[fail] got $stale_nr stale[s] $recover_nr recover[s], " \
" expected stale in range [$stale_min..$stale_max]," \
" stale-recover delta $stale_delta "
@@ -1039,7 +1045,7 @@ chk_add_nr()
# if the test configured a short timeout tolerate greater then expected
# add addrs options, due to retransmissions
- if [ "$count" != "$add_nr" ] && [ "$timeout" -gt 1 -o "$count" -lt "$add_nr" ]; then
+ if [ "$count" != "$add_nr" ] && { [ "$timeout" -gt 1 ] || [ "$count" -lt "$add_nr" ]; }; then
echo "[fail] got $count ADD_ADDR[s] expected $add_nr"
fail_test
dump_stats=1
@@ -1225,13 +1231,13 @@ chk_link_usage()
local tx_link tx_total
tx_link=$(ip netns exec $ns cat /sys/class/net/$link/statistics/tx_bytes)
- tx_total=$(ls -l $out | awk '{print $5}')
- local tx_rate=$((tx_link * 100 / $tx_total))
+ tx_total=$(stat --format=%s $out)
+ local tx_rate=$((tx_link * 100 / tx_total))
local tolerance=5
printf "%-${nr_blank}s %-18s" " " "link usage"
- if [ $tx_rate -lt $((expected_rate - $tolerance)) -o \
- $tx_rate -gt $((expected_rate + $tolerance)) ]; then
+ if [ $tx_rate -lt $((expected_rate - tolerance)) ] || \
+ [ $tx_rate -gt $((expected_rate + tolerance)) ]; then
echo "[fail] got $tx_rate% usage, expected $expected_rate%"
fail_test
else
--
2.34.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh
2022-02-17 17:43 [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Matthieu Baerts
` (8 preceding siblings ...)
2022-02-17 17:43 ` [PATCH mptcp-next v2 9/9] selftests: mptcp: join: make it shellcheck compliant Matthieu Baerts
@ 2022-02-18 0:33 ` Mat Martineau
2022-02-18 11:04 ` Paolo Abeni
9 siblings, 1 reply; 19+ messages in thread
From: Mat Martineau @ 2022-02-18 0:33 UTC (permalink / raw)
To: Matthieu Baerts; +Cc: Paolo Abeni, mptcp
On Thu, 17 Feb 2022, Matthieu Baerts wrote:
> A few patches from the v1 have already been applied.
>
> Compared to the v1, this series comes with new patches and updated ones.
>
> Patch 1/9 was suggested by Paolo: bigger than the original one but following the
> standard way of using getopt. This is also clearer and avoid regexes.
>
> Patch 2/9: while working on patch 1/9, I was annoyed by having the tests groups
> defined multiple times. And I think it already happened to have missed the
> update of one of them :)
>
> Patch 3/9 is "safer" but also needed with the new options to execute specific
> tests.
>
Patches 1-3 look good to apply now:
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
> Patch 4/9 is the updated version of the previous patch 3/9 from v1: mainly
> rebased. I only added one line in the "usage()" function and use lower cases for
> only_tests variable.
>
> Patch 5/9 is new and similar to the previous patch: another way to execute a
> specific test, useful when using 'git blame'. Also help to have patch 6/9.
>
These are running fine for me, it's just the issue of 2000+ lines of churn
and the potential (or even likely) net/net-next merge conflicts if we need
to modify mptcp_join.sh after the 5.18 merge window. Hopefully all the
work we're doing now to stabilize the tests means we will not have as many
-net mptcp_join.sh changes in the next cycle, but we would still probably
run in to some headaches. If we do apply these it would need to be right
before net-next closes for 5.18.
Since you've put this much work into this patch it implies that you think
the merge headaches would be worth it for the 5.18 development cycle :)
For the way I use the test script the ability to test by number is not
that critical - is anyone else (Paolo?) thinking you'll use this feature?
> Patch 6/9 is a handy feature when trying to find which tests had issues when
> executed on a CI or locally.
>
I like this! Highly dependent on previous patches though.
> Patch 7/9 was present in the v1. Non local variables have no longer been renamed
> + a there were a few missing 'local' keywords.
>
This seems a lot more manageable than v1, thanks.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
> Patch 8/9 and 9/9 are the same as in v1 but rebased. We are still ShellCheck
> compliant.
>
These look good too:
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
> Matthieu Baerts (9):
> Squash to "selftests: mptcp: join: allow running -cCi"
> selftests: mptcp: join: define tests groups once
> selftests: mptcp: join: reset failing links
> selftests: mptcp: join: option to execute specific tests
> selftests: mptcp: join: alt. to exec specific tests
> selftests: mptcp: join: list failure at the end
> selftests: mptcp: join: clarify local/global vars
> selftests: mptcp: join: avoid backquotes
> selftests: mptcp: join: make it shellcheck compliant
>
> .../testing/selftests/net/mptcp/mptcp_join.sh | 2248 +++++++++--------
> 1 file changed, 1202 insertions(+), 1046 deletions(-)
>
> --
> 2.34.1
>
>
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh
2022-02-18 0:33 ` [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh Mat Martineau
@ 2022-02-18 11:04 ` Paolo Abeni
2022-02-18 16:43 ` Paolo Abeni
0 siblings, 1 reply; 19+ messages in thread
From: Paolo Abeni @ 2022-02-18 11:04 UTC (permalink / raw)
To: Mat Martineau, Matthieu Baerts; +Cc: mptcp
On Thu, 2022-02-17 at 16:33 -0800, Mat Martineau wrote:
> > Patch 4/9 is the updated version of the previous patch 3/9 from v1: mainly
> > rebased. I only added one line in the "usage()" function and use lower cases for
> > only_tests variable.
> >
> > Patch 5/9 is new and similar to the previous patch: another way to execute a
> > specific test, useful when using 'git blame'. Also help to have patch 6/9.
> >
>
> These are running fine for me, it's just the issue of 2000+ lines of churn
> and the potential (or even likely) net/net-next merge conflicts if we need
> to modify mptcp_join.sh after the 5.18 merge window. Hopefully all the
> work we're doing now to stabilize the tests means we will not have as many
> -net mptcp_join.sh changes in the next cycle, but we would still probably
> run in to some headaches. If we do apply these it would need to be right
> before net-next closes for 5.18.
>
> Since you've put this much work into this patch it implies that you think
> the merge headaches would be worth it for the 5.18 development cycle :)
> For the way I use the test script the ability to test by number is not
> that critical - is anyone else (Paolo?) thinking you'll use this feature?
That feature would have saved a significant amount of my time in the
past weeks. I think the diffstat is a bit too much, and I still would
prefer the other approach of filtering out the test in each helper used
by the test themself.
Additionally, I think it would be nice replace the 'bare' ip netns exec
...' we still have in some the userspace tests with the appropriate
helpers - possibly worth a separate, independent patch.
/P
>
>
> > Patch 6/9 is a handy feature when trying to find which tests had issues when
> > executed on a CI or locally.
> >
>
> I like this! Highly dependent on previous patches though.
>
> > Patch 7/9 was present in the v1. Non local variables have no longer been renamed
> > + a there were a few missing 'local' keywords.
> >
>
> This seems a lot more manageable than v1, thanks.
>
> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
>
> > Patch 8/9 and 9/9 are the same as in v1 but rebased. We are still ShellCheck
> > compliant.
> >
>
> These look good too:
>
> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
>
> > Matthieu Baerts (9):
> > Squash to "selftests: mptcp: join: allow running -cCi"
> > selftests: mptcp: join: define tests groups once
> > selftests: mptcp: join: reset failing links
> > selftests: mptcp: join: option to execute specific tests
> > selftests: mptcp: join: alt. to exec specific tests
> > selftests: mptcp: join: list failure at the end
> > selftests: mptcp: join: clarify local/global vars
> > selftests: mptcp: join: avoid backquotes
> > selftests: mptcp: join: make it shellcheck compliant
> >
> > .../testing/selftests/net/mptcp/mptcp_join.sh | 2248 +++++++++--------
> > 1 file changed, 1202 insertions(+), 1046 deletions(-)
> >
> > --
> > 2.34.1
> >
> >
> >
>
> --
> Mat Martineau
> Intel
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh
2022-02-18 11:04 ` Paolo Abeni
@ 2022-02-18 16:43 ` Paolo Abeni
2022-02-18 18:59 ` Mat Martineau
0 siblings, 1 reply; 19+ messages in thread
From: Paolo Abeni @ 2022-02-18 16:43 UTC (permalink / raw)
To: Mat Martineau, Matthieu Baerts; +Cc: mptcp
On Fri, 2022-02-18 at 12:04 +0100, Paolo Abeni wrote:
> On Thu, 2022-02-17 at 16:33 -0800, Mat Martineau wrote:
> > > Patch 4/9 is the updated version of the previous patch 3/9 from v1: mainly
> > > rebased. I only added one line in the "usage()" function and use lower cases for
> > > only_tests variable.
> > >
> > > Patch 5/9 is new and similar to the previous patch: another way to execute a
> > > specific test, useful when using 'git blame'. Also help to have patch 6/9.
> > >
> >
> > These are running fine for me, it's just the issue of 2000+ lines of churn
> > and the potential (or even likely) net/net-next merge conflicts if we need
> > to modify mptcp_join.sh after the 5.18 merge window. Hopefully all the
> > work we're doing now to stabilize the tests means we will not have as many
> > -net mptcp_join.sh changes in the next cycle, but we would still probably
> > run in to some headaches. If we do apply these it would need to be right
> > before net-next closes for 5.18.
> >
> > Since you've put this much work into this patch it implies that you think
> > the merge headaches would be worth it for the 5.18 development cycle :)
> > For the way I use the test script the ability to test by number is not
> > that critical - is anyone else (Paolo?) thinking you'll use this feature?
>
> That feature would have saved a significant amount of my time in the
> past weeks. I think the diffstat is a bit too much, and I still would
> prefer the other approach of filtering out the test in each helper used
> by the test themself.
Uhmmm... my main argument vs the current version of patch 4 is defeated
by patches 5 && 6, which look useful. So I'm ok with patch 4 as is...
> Additionally, I think it would be nice replace the 'bare' ip netns exec
> ...' we still have in some the userspace tests with the appropriate
> helpers - possibly worth a separate, independent patch.
... still think it would be nice (almost necessary) cover the above ->
migrate all direct ip netns exec... usage to the appropriate helper.
/P
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh
2022-02-18 16:43 ` Paolo Abeni
@ 2022-02-18 18:59 ` Mat Martineau
2022-02-18 21:05 ` Matthieu Baerts
0 siblings, 1 reply; 19+ messages in thread
From: Mat Martineau @ 2022-02-18 18:59 UTC (permalink / raw)
To: Paolo Abeni, Matthieu Baerts; +Cc: mptcp
On Fri, 18 Feb 2022, Paolo Abeni wrote:
> On Fri, 2022-02-18 at 12:04 +0100, Paolo Abeni wrote:
>> On Thu, 2022-02-17 at 16:33 -0800, Mat Martineau wrote:
>>>> Patch 4/9 is the updated version of the previous patch 3/9 from v1: mainly
>>>> rebased. I only added one line in the "usage()" function and use lower cases for
>>>> only_tests variable.
>>>>
>>>> Patch 5/9 is new and similar to the previous patch: another way to execute a
>>>> specific test, useful when using 'git blame'. Also help to have patch 6/9.
>>>>
>>>
>>> These are running fine for me, it's just the issue of 2000+ lines of churn
>>> and the potential (or even likely) net/net-next merge conflicts if we need
>>> to modify mptcp_join.sh after the 5.18 merge window. Hopefully all the
>>> work we're doing now to stabilize the tests means we will not have as many
>>> -net mptcp_join.sh changes in the next cycle, but we would still probably
>>> run in to some headaches. If we do apply these it would need to be right
>>> before net-next closes for 5.18.
>>>
>>> Since you've put this much work into this patch it implies that you think
>>> the merge headaches would be worth it for the 5.18 development cycle :)
>>> For the way I use the test script the ability to test by number is not
>>> that critical - is anyone else (Paolo?) thinking you'll use this feature?
>>
>> That feature would have saved a significant amount of my time in the
>> past weeks. I think the diffstat is a bit too much, and I still would
>> prefer the other approach of filtering out the test in each helper used
>> by the test themself.
>
> Uhmmm... my main argument vs the current version of patch 4 is defeated
> by patches 5 && 6, which look useful. So I'm ok with patch 4 as is...
>
Ok, thanks for the insight! I do like the features, just wanted to make
sure there's enough interest to justify the conflict resolution work we're
signing up for. And it does seem like the payoff is worth it. At least
it's a selftest script and not kernel code that could be disrupted by
incorrect git conflict resolution here :)
>> Additionally, I think it would be nice replace the 'bare' ip netns exec
>> ...' we still have in some the userspace tests with the appropriate
>> helpers - possibly worth a separate, independent patch.
>
> ... still think it would be nice (almost necessary) cover the above ->
> migrate all direct ip netns exec... usage to the appropriate helper.
>
Sure, that would be good too.
Matthieu, I think it would be good to delay adding 4/5/6 to the export
branch until mptcp_join.sh has stabilized in -net and been merged back to
net-next - what do you think? Once these changes go in to the export
branch we have a lot less flexibility in the order that patches go to
net-next.
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh
2022-02-18 18:59 ` Mat Martineau
@ 2022-02-18 21:05 ` Matthieu Baerts
2022-02-18 22:37 ` Mat Martineau
0 siblings, 1 reply; 19+ messages in thread
From: Matthieu Baerts @ 2022-02-18 21:05 UTC (permalink / raw)
To: Mat Martineau, Paolo Abeni; +Cc: mptcp
Hi Mat,
On 18/02/2022 19:59, Mat Martineau wrote:
> On Fri, 18 Feb 2022, Paolo Abeni wrote:
>
>> On Fri, 2022-02-18 at 12:04 +0100, Paolo Abeni wrote:
>>> On Thu, 2022-02-17 at 16:33 -0800, Mat Martineau wrote:
>>>>> Patch 4/9 is the updated version of the previous patch 3/9 from v1:
>>>>> mainly
>>>>> rebased. I only added one line in the "usage()" function and use
>>>>> lower cases for
>>>>> only_tests variable.
>>>>>
>>>>> Patch 5/9 is new and similar to the previous patch: another way to
>>>>> execute a
>>>>> specific test, useful when using 'git blame'. Also help to have
>>>>> patch 6/9.
>>>>>
>>>>
>>>> These are running fine for me, it's just the issue of 2000+ lines of
>>>> churn
>>>> and the potential (or even likely) net/net-next merge conflicts if
>>>> we need
>>>> to modify mptcp_join.sh after the 5.18 merge window. Hopefully all the
>>>> work we're doing now to stabilize the tests means we will not have
>>>> as many
>>>> -net mptcp_join.sh changes in the next cycle, but we would still
>>>> probably
>>>> run in to some headaches. If we do apply these it would need to be
>>>> right
>>>> before net-next closes for 5.18.
>>>>
>>>> Since you've put this much work into this patch it implies that you
>>>> think
>>>> the merge headaches would be worth it for the 5.18 development cycle :)
>>>> For the way I use the test script the ability to test by number is not
>>>> that critical - is anyone else (Paolo?) thinking you'll use this
>>>> feature?
>>>
>>> That feature would have saved a significant amount of my time in the
>>> past weeks. I think the diffstat is a bit too much, and I still would
>>> prefer the other approach of filtering out the test in each helper used
>>> by the test themself.
>>
>> Uhmmm... my main argument vs the current version of patch 4 is defeated
>> by patches 5 && 6, which look useful. So I'm ok with patch 4 as is...
>>
>
> Ok, thanks for the insight! I do like the features, just wanted to make
> sure there's enough interest to justify the conflict resolution work
> we're signing up for. And it does seem like the payoff is worth it. At
> least it's a selftest script and not kernel code that could be disrupted
> by incorrect git conflict resolution here :)
I think it is the good time to do that when you look at the diff with
the -net branch: a lot of other modifications in the same area have been
queued up in net-next :)
>>> Additionally, I think it would be nice replace the 'bare' ip netns exec
>>> ...' we still have in some the userspace tests with the appropriate
>>> helpers - possibly worth a separate, independent patch.
>>
>> ... still think it would be nice (almost necessary) cover the above ->
>> migrate all direct ip netns exec... usage to the appropriate helper.
>>
>
> Sure, that would be good too.
>
> Matthieu, I think it would be good to delay adding 4/5/6 to the export
> branch until mptcp_join.sh has stabilized in -net and been merged back
> to net-next - what do you think? Once these changes go in to the export
> branch we have a lot less flexibility in the order that patches go to
> net-next.
Sure I can. Do you mean waiting for the other patches that are in review
to fix issues in the tests?
I was thinking about that and I don't know if we need to wait: we
already have the commit 34aa6e3bccd8 ("selftests: mptcp: add ip mptcp
wrappers") in net-next and there is no patches for -net that are
currently planned if I'm not mistaken.
If we still want to send them to net-next later, I can also apply these
patches after "git markup: features net-next": so just after new patches
that will come in the next days/weeks.
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH mptcp-next v2 0/9] Refactor mptcp_join.sh
2022-02-18 21:05 ` Matthieu Baerts
@ 2022-02-18 22:37 ` Mat Martineau
0 siblings, 0 replies; 19+ messages in thread
From: Mat Martineau @ 2022-02-18 22:37 UTC (permalink / raw)
To: Matthieu Baerts; +Cc: Paolo Abeni, mptcp
On Fri, 18 Feb 2022, Matthieu Baerts wrote:
> Hi Mat,
>
> On 18/02/2022 19:59, Mat Martineau wrote:
>> On Fri, 18 Feb 2022, Paolo Abeni wrote:
>>
>>> On Fri, 2022-02-18 at 12:04 +0100, Paolo Abeni wrote:
>>>> On Thu, 2022-02-17 at 16:33 -0800, Mat Martineau wrote:
>>>>>> Patch 4/9 is the updated version of the previous patch 3/9 from v1:
>>>>>> mainly
>>>>>> rebased. I only added one line in the "usage()" function and use
>>>>>> lower cases for
>>>>>> only_tests variable.
>>>>>>
>>>>>> Patch 5/9 is new and similar to the previous patch: another way to
>>>>>> execute a
>>>>>> specific test, useful when using 'git blame'. Also help to have
>>>>>> patch 6/9.
>>>>>>
>>>>>
>>>>> These are running fine for me, it's just the issue of 2000+ lines of
>>>>> churn
>>>>> and the potential (or even likely) net/net-next merge conflicts if
>>>>> we need
>>>>> to modify mptcp_join.sh after the 5.18 merge window. Hopefully all the
>>>>> work we're doing now to stabilize the tests means we will not have
>>>>> as many
>>>>> -net mptcp_join.sh changes in the next cycle, but we would still
>>>>> probably
>>>>> run in to some headaches. If we do apply these it would need to be
>>>>> right
>>>>> before net-next closes for 5.18.
>>>>>
>>>>> Since you've put this much work into this patch it implies that you
>>>>> think
>>>>> the merge headaches would be worth it for the 5.18 development cycle :)
>>>>> For the way I use the test script the ability to test by number is not
>>>>> that critical - is anyone else (Paolo?) thinking you'll use this
>>>>> feature?
>>>>
>>>> That feature would have saved a significant amount of my time in the
>>>> past weeks. I think the diffstat is a bit too much, and I still would
>>>> prefer the other approach of filtering out the test in each helper used
>>>> by the test themself.
>>>
>>> Uhmmm... my main argument vs the current version of patch 4 is defeated
>>> by patches 5 && 6, which look useful. So I'm ok with patch 4 as is...
>>>
>>
>> Ok, thanks for the insight! I do like the features, just wanted to make
>> sure there's enough interest to justify the conflict resolution work
>> we're signing up for. And it does seem like the payoff is worth it. At
>> least it's a selftest script and not kernel code that could be disrupted
>> by incorrect git conflict resolution here :)
>
> I think it is the good time to do that when you look at the diff with
> the -net branch: a lot of other modifications in the same area have been
> queued up in net-next :)
>
>>>> Additionally, I think it would be nice replace the 'bare' ip netns exec
>>>> ...' we still have in some the userspace tests with the appropriate
>>>> helpers - possibly worth a separate, independent patch.
>>>
>>> ... still think it would be nice (almost necessary) cover the above ->
>>> migrate all direct ip netns exec... usage to the appropriate helper.
>>>
>>
>> Sure, that would be good too.
>>
>> Matthieu, I think it would be good to delay adding 4/5/6 to the export
>> branch until mptcp_join.sh has stabilized in -net and been merged back
>> to net-next - what do you think? Once these changes go in to the export
>> branch we have a lot less flexibility in the order that patches go to
>> net-next.
>
> Sure I can. Do you mean waiting for the other patches that are in review
> to fix issues in the tests?
>
Yes, that's part of it.
I can't send these for net-next until after these patches show up in
net-next (via merge from -net):
https://lore.kernel.org/netdev/20220218213544.70285-1-mathew.j.martineau@linux.intel.com/T/
Any groups of patches touching mptcp_join.sh after these major-churn
patches in the export branch would be blocked from net-next upstreaming
until net/master and net-next/master are synced again.
Also, any mptcp_join.sh development work on the export branch would have
similar dependencies. But I probably shouldn't worry about that too much.
> I was thinking about that and I don't know if we need to wait: we
> already have the commit 34aa6e3bccd8 ("selftests: mptcp: add ip mptcp
> wrappers") in net-next and there is no patches for -net that are
> currently planned if I'm not mistaken.
>
-net patches are rarely planned :)
> If we still want to send them to net-next later, I can also apply these
> patches after "git markup: features net-next": so just after new patches
> that will come in the next days/weeks.
>
That should work. Thanks!
Also, to be clear for patches 4-6:
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 19+ messages in thread