selftests: net: lib: ignore possible errors
[ Upstream commit 7e0620bc6a5ec6b340a0be40054f294ca26c010f ] No need to disable errexit temporary, simply ignore the only possible and not handled error. Reviewed-by: Geliang Tang <geliang@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://lore.kernel.org/r/20240607-upstream-net-next-20240607-selftests-mptcp-net-lib-v1-1-e36986faac94@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Stable-dep-of: 7965a7f32a53 ("selftests: net: lib: kill PIDs before del netns") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
921f1acf0c
commit
fc9cae2199
tools/testing/selftests/net
|
@ -38,25 +38,17 @@ busywait()
|
|||
cleanup_ns()
|
||||
{
|
||||
local ns=""
|
||||
local errexit=0
|
||||
local ret=0
|
||||
|
||||
# disable errexit temporary
|
||||
if [[ $- =~ "e" ]]; then
|
||||
errexit=1
|
||||
set +e
|
||||
fi
|
||||
|
||||
for ns in "$@"; do
|
||||
[ -z "${ns}" ] && continue
|
||||
ip netns delete "${ns}" &> /dev/null
|
||||
ip netns delete "${ns}" &> /dev/null || true
|
||||
if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /dev/null; then
|
||||
echo "Warn: Failed to remove namespace $ns"
|
||||
ret=1
|
||||
fi
|
||||
done
|
||||
|
||||
[ $errexit -eq 1 ] && set -e
|
||||
return $ret
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue