korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

selftests: pmtu: Simplify cleanup and namespace names

Browse Source 
The point of the pause-on-fail argument is to leave the setup as is after
a test fails to allow a user to debug why it failed. Move the cleanup
after posting the result to the user to make it so.

Random names for the namespaces are not user friendly when trying to
debug a failure. Make them simpler and more direct for the tests. Run
cleanup at the beginning to ensure they are cleaned up if they already
exist.

Remove cleanup_done. There is no harm in doing cleanup twice; just
ignore any errors related to not existing - which is already done.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2019-05-22 12:11:06 -07:00 committed by David S. Miller
parent 9b7e94e6e8
commit a92a0a7b8e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/testing/selftests/net/pmtu.sh
View File

@ -152,10 +152,10 @@ tests="
cleanup_ipv4_exception ipv4: cleanup of cached exceptions cleanup_ipv4_exception ipv4: cleanup of cached exceptions
cleanup_ipv6_exception ipv6: cleanup of cached exceptions" cleanup_ipv6_exception ipv6: cleanup of cached exceptions"
NS_A="ns-$(mktemp -u XXXXXX)" NS_A="ns-A"
NS_B="ns-$(mktemp -u XXXXXX)" NS_B="ns-B"
NS_R1="ns-$(mktemp -u XXXXXX)" NS_R1="ns-R1"
NS_R2="ns-$(mktemp -u XXXXXX)" NS_R2="ns-R2"
ns_a="ip netns exec ${NS_A}" ns_a="ip netns exec ${NS_A}"
ns_b="ip netns exec ${NS_B}" ns_b="ip netns exec ${NS_B}"
ns_r1="ip netns exec ${NS_R1}" ns_r1="ip netns exec ${NS_R1}"
@ -212,7 +212,6 @@ dummy6_0_addr="fc00:1000::0"
dummy6_1_addr="fc00:1001::0" dummy6_1_addr="fc00:1001::0"
dummy6_mask="64" dummy6_mask="64"
cleanup_done=1
err_buf= err_buf=
tcpdump_pids= tcpdump_pids=
@ -495,7 +494,7 @@ setup_routing() {
setup() { setup() {
[ "$(id -u)" -ne 0 ] && echo " need to run as root" && return $ksft_skip [ "$(id -u)" -ne 0 ] && echo " need to run as root" && return $ksft_skip
cleanup_done=0 cleanup
for arg do for arg do
eval setup_${arg} || { echo " ${arg} not supported"; return 1; } eval setup_${arg} || { echo " ${arg} not supported"; return 1; }
done done
@ -519,11 +518,9 @@ cleanup() {
done done
tcpdump_pids= tcpdump_pids=
[ ${cleanup_done} -eq 1 ] && return
for n in ${NS_A} ${NS_B} ${NS_R1} ${NS_R2}; do for n in ${NS_A} ${NS_B} ${NS_R1} ${NS_R2}; do
ip netns del ${n} 2> /dev/null ip netns del ${n} 2> /dev/null
done done
cleanup_done=1
} }
mtu() { mtu() {
@ -1136,6 +1133,9 @@ done
trap cleanup EXIT trap cleanup EXIT
# start clean
cleanup
for t in ${tests}; do for t in ${tests}; do
[ $desc -eq 0 ] && name="${t}" && desc=1 && continue || desc=0 [ $desc -eq 0 ] && name="${t}" && desc=1 && continue || desc=0
@ -1156,7 +1156,6 @@ for t in ${tests}; do
eval test_${name} eval test_${name}
ret=$? ret=$?
cleanup
if [ $ret -eq 0 ]; then if [ $ret -eq 0 ]; then
printf "TEST: %-60s [ OK ]\n" "${t}" printf "TEST: %-60s [ OK ]\n" "${t}"