testing: Fix expect-connection for tkm tests

[strongswan.git] / testing / hosts / default / usr / local / bin / expect-connection

diff --git a/testing/hosts/default/usr/local/bin/expect-connection b/testing/hosts/default/usr/local/bin/expect-connection
index 10a7092..ded9f79 100755 (executable)
--- a/testing/hosts/default/usr/local/bin/expect-connection
+++ b/testing/hosts/default/usr/local/bin/expect-connection
@@ -15,10 +15,16 @@ fi
 secs=$2
 [ ! $secs ] && secs=5
 
 secs=$2
 [ ! $secs ] && secs=5
 

+cmd="swanctl --list-conns"
+grep 'load.*stroke' /etc/strongswan.conf >/dev/null
+if [ $? -eq 0 -o -n "$DAEMON_NAME" ]; then
+       cmd="ipsec statusall"
+fi
+

 let steps=$secs*10
 for i in `seq 1 $steps`
 do
 let steps=$secs*10
 for i in `seq 1 $steps`
 do

-       ipsec statusall 2>&1 | grep ^[[:space:]]*$1: >/dev/null
+       $cmd 2>&1 | grep ^[[:space:]]*$1: >/dev/null

        [ $? -eq 0 ] && exit 0
        sleep 0.1
 done
        [ $? -eq 0 ] && exit 0
        sleep 0.1
 done