From b77e25c381a61cb9c3aebe58628d61dc9958e41d Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 19 Nov 2015 17:49:20 +0100 Subject: [PATCH] testing: The expect-connection helper may use swanctl to check for connections Depending on the plugin configuration in the test scenario either `ipsec statusall` or `swanctl --list-conns` is used to check for a named connection. --- testing/hosts/default/usr/local/bin/expect-connection | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testing/hosts/default/usr/local/bin/expect-connection b/testing/hosts/default/usr/local/bin/expect-connection index 10a709255..17e2b7fbe 100755 --- 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 +cmd="swanctl --list-conns" +grep 'load.*stroke' /etc/strongswan.conf >/dev/null +if [ $? -eq 0 ]; then + cmd="ipsec statusall" +fi + 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