summaryrefslogtreecommitdiffhomepage
path: root/src/tests/netns.sh
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2016-12-26 16:34:53 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2016-12-26 19:32:30 +0100
commit7bd9f96d8f9fc838f1328efd52b68717502b7e09 (patch)
tree297f21708c26aab1b100b5a41963bfe0d98d272a /src/tests/netns.sh
parentbf6f63810f4c6754328bf9ec726e7f09cec786b7 (diff)
compat: support 3.18, 3.19, 4.0
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/tests/netns.sh')
-rwxr-xr-xsrc/tests/netns.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tests/netns.sh b/src/tests/netns.sh
index f17a3ef..6d20c1b 100755
--- a/src/tests/netns.sh
+++ b/src/tests/netns.sh
@@ -39,7 +39,7 @@ ip2() { pretty 2 "ip $*"; ip -n $netns2 "$@"; }
sleep() { read -t "$1" -N 0 || true; }
waitiperf() { pretty "${1//*-}" "wait for iperf:5201"; while [[ $(ss -N "$1" -tlp 'sport = 5201') != *iperf3* ]]; do sleep 0.1; done; }
waitncatudp() { pretty "${1//*-}" "wait for udp:1111"; while [[ $(ss -N "$1" -ulp 'sport = 1111') != *ncat* ]]; do sleep 0.1; done; }
-waitiface() { pretty "${1//*-}" "wait for $2 to come up"; ip netns exec "$1" bash -c "while [[ \$(< \"/sys/class/net/$2/operstate\") != up ]]; do read -t .1 -N 0; done;"; }
+waitiface() { pretty "${1//*-}" "wait for $2 to come up"; ip netns exec "$1" bash -c "while [[ \$(< \"/sys/class/net/$2/operstate\") != up ]]; do read -t .1 -N 0 || true; done;"; }
cleanup() {
set +e