test timing: wait up to 10s for OpenConnect client to terminating

Signed-off-by: Daniel Lenski <dlenski@gmail.com>

diff --git a/tests/vpn-noroute b/tests/vpn-noroute
index 8e89e23312d35c3f3f7bbf52022be15ce765972e..a712004ec5a8db0b089cbfacaeb0b9191cf16bf2 100755 (executable)
--- a/tests/vpn-noroute
+++ b/tests/vpn-noroute
@@ -210,8 +210,14 @@ echo " * Found all expected routes"
 echo " * Terminating client"
 
 # Kill the client and check whether resolvconf is as expected
-test -e "${CLIPIDFILE}" && kill $(cat ${CLIPIDFILE}) >/dev/null 2>&1
-test -e "${CLIPIDFILE}" && rm -f ${CLIPIDFILE} >/dev/null 2>&1
+if test -e "${CLIPIDFILE}"; then
+    kill $(cat ${CLIPIDFILE}) >/dev/null 2>&1
+    for ii in $(seq 10); do
+        kill -0 $(cat ${CLIPIDFILE}) >/dev/null 2>&1 || break
+        sleep 1
+    done
+    rm -f ${CLIPIDFILE} >/dev/null 2>&1
+fi
 
 
 sleep 4

diff --git a/tests/vpn-routes b/tests/vpn-routes
index 4bf4570483825727fe862cdbfd4865b665fdaabb..7e3c487cad90cab6c76b5fd5e8f0c8191767e4fd 100755 (executable)
--- a/tests/vpn-routes
+++ b/tests/vpn-routes
@@ -190,8 +190,14 @@ echo " * Found all expected routes"
 echo " * Terminating client"
 
 # Kill the client and check whether resolvconf is as expected
-test -e "${CLIPIDFILE}" && kill $(cat ${CLIPIDFILE}) >/dev/null 2>&1
-test -e "${CLIPIDFILE}" && rm -f ${CLIPIDFILE} >/dev/null 2>&1
+if test -e "${CLIPIDFILE}"; then
+    kill $(cat ${CLIPIDFILE}) >/dev/null 2>&1
+    for ii in $(seq 10); do
+        kill -0 $(cat ${CLIPIDFILE}) >/dev/null 2>&1 || break
+        sleep 1
+    done
+    rm -f ${CLIPIDFILE} >/dev/null 2>&1
+fi
 
 
 sleep 4