From 2677cbbfe1d0a8dc2fe139c776cd88261761a908 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Wed, 25 Apr 2018 00:08:28 -0700 Subject: tests: missed a spot. --- tests/netns.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'tests/netns.sh') diff --git a/tests/netns.sh b/tests/netns.sh index 0975fc6..bd2d844 100755 --- a/tests/netns.sh +++ b/tests/netns.sh @@ -60,9 +60,9 @@ cleanup() { set +e exec 2>/dev/null printf "$orig_message_cost" > /proc/sys/net/core/message_cost - ip0 link del dev wg1 + ip0 link del dev wg0 ip1 link del dev wg1 - ip2 link del dev wg1 + ip2 link del dev wg2 local to_kill="$(ip netns pids $netns0) $(ip netns pids $netns1) $(ip netns pids $netns2)" [[ -n $to_kill ]] && kill $to_kill pp ip netns del $netns1 @@ -72,14 +72,8 @@ cleanup() { } error() { - local parent_lineno="$1" - local message="$2" local code="${3:-1}" - if [[ -n "$message" ]] ; then - warn "Test failed at line ${parent_lineno}: ${message}; exiting with status ${code}" - else - warn "Test failed at line ${parent_lineno}; exiting with status ${code}" - fi + warn "Test failed at line $1." exit "${code}" } -- cgit v1.2.3-59-g8ed1b