This series cleans MPTCP selftests code.
Patch 1 stops using 'iptables-legacy' if available, but uses 'iptables',
which is likely 'iptables-nft' behind.
Patches 2, 4 and 6 move duplicated code to mptcp_lib.sh. Patch 3 is a
preparation for patch 4, and patch 5 adds generic actions at the
creation and deletion of netns.
Patches 7 to 11 disable a few shellcheck warnings, and fix the rest, so
it is easy to spot real issues later. MPTCP CI is checking that now.
Patch 12 avoids redoing some actions at init time twice, e.g. restarting
the pm events tool.
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
---
Changes in v2:
- The former patch 3/13 ("selftests: mptcp: add mptcp_lib_check_output
helper") has been dropped, it was not supposed to be sent.
- Link to v1: https://lore.kernel.org/r/20240305-upstream-net-next-20240304-selftests-mptcp-shared-code-shellcheck-v1-0-66618ea5504e@xxxxxxxxxx
---
Geliang Tang (5):
selftests: mptcp: add mptcp_lib_check_tools helper
selftests: mptcp: add local variables rndh
selftests: mptcp: add mptcp_lib_ns_init/exit helpers
selftests: mptcp: more operations in ns_init/exit
selftests: mptcp: add mptcp_lib_events helper
Matthieu Baerts (NGI0) (7):
selftests: mptcp: stop forcing iptables-legacy
selftests: mptcp: diag: fix shellcheck warnings
selftests: mptcp: connect: fix shellcheck warnings
selftests: mptcp: sockopt: fix shellcheck warnings
selftests: mptcp: pm netlink: fix shellcheck warnings
selftests: mptcp: simult flows: fix shellcheck warnings
selftests: userspace pm: avoid relaunching pm events
tools/testing/selftests/net/mptcp/diag.sh | 35 +++----
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 111 +++++++++++----------
tools/testing/selftests/net/mptcp/mptcp_join.sh | 60 ++---------
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 68 +++++++++++++
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 55 +++-------
tools/testing/selftests/net/mptcp/pm_netlink.sh | 31 +++---
tools/testing/selftests/net/mptcp/simult_flows.sh | 38 +++----
tools/testing/selftests/net/mptcp/userspace_pm.sh | 56 +++--------
8 files changed, 210 insertions(+), 244 deletions(-)
---
base-commit: 09fcde54776180a76e99cae7f6d51b33c4a06525
change-id: 20240304-upstream-net-next-20240304-selftests-mptcp-shared-code-shellcheck-160fceb5ce44
Best regards,
--
Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
