diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-10-03 12:20:37 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-10-03 12:44:14 +0200 |
| commit | 12e9ed12ecf1f84264c509559b2ad7f61618fb7b (patch) | |
| tree | 9703bdf68ba99cc7433069d048a691bc02186dc5 | |
| parent | e9028462c83600f9de3e18338b1e499b121656c3 (diff) | |
| download | strongswan-12e9ed12ecf1f84264c509559b2ad7f61618fb7b.tar.bz2 strongswan-12e9ed12ecf1f84264c509559b2ad7f61618fb7b.tar.xz | |
testing: Wait a bit in swanctl scenarios before interacting with the daemon
| -rwxr-xr-x | testing/tests/swanctl/ip-pool/pretest.dat | 3 | ||||
| -rwxr-xr-x | testing/tests/swanctl/net2net-cert/pretest.dat | 3 | ||||
| -rwxr-xr-x | testing/tests/swanctl/net2net-route/pretest.dat | 5 | ||||
| -rwxr-xr-x | testing/tests/swanctl/net2net-start/pretest.dat | 5 | ||||
| -rwxr-xr-x | testing/tests/swanctl/rw-cert/pretest.dat | 3 | ||||
| -rwxr-xr-x | testing/tests/swanctl/rw-psk-fqdn/pretest.dat | 3 | ||||
| -rwxr-xr-x | testing/tests/swanctl/rw-psk-ipv4/pretest.dat | 3 |
7 files changed, 16 insertions, 9 deletions
diff --git a/testing/tests/swanctl/ip-pool/pretest.dat b/testing/tests/swanctl/ip-pool/pretest.dat index d1afdf0be..25288f5ba 100755 --- a/testing/tests/swanctl/ip-pool/pretest.dat +++ b/testing/tests/swanctl/ip-pool/pretest.dat @@ -1,9 +1,10 @@ moon::iptables-restore < /etc/iptables.rules carol::iptables-restore < /etc/iptables.rules dave::iptables-restore < /etc/iptables.rules -moon::service charon start 2> /dev/null +moon::service charon start 2> /dev/null carol::service charon start 2> /dev/null dave::service charon start 2> /dev/null +moon::sleep 1 moon::swanctl --load-conns 2> /dev/null carol::swanctl --load-conns 2> /dev/null dave::swanctl --load-conns 2> /dev/null diff --git a/testing/tests/swanctl/net2net-cert/pretest.dat b/testing/tests/swanctl/net2net-cert/pretest.dat index 2c4ba6ca2..382564367 100755 --- a/testing/tests/swanctl/net2net-cert/pretest.dat +++ b/testing/tests/swanctl/net2net-cert/pretest.dat @@ -1,7 +1,8 @@ moon::iptables-restore < /etc/iptables.rules sun::iptables-restore < /etc/iptables.rules -moon::service charon start 2> /dev/null +moon::service charon start 2> /dev/null sun::service charon start 2> /dev/null +moon::sleep 1 moon::swanctl --load-conns 2> /dev/null sun::swanctl --load-conns 2> /dev/null moon::swanctl --load-creds 2> /dev/null diff --git a/testing/tests/swanctl/net2net-route/pretest.dat b/testing/tests/swanctl/net2net-route/pretest.dat index 61e33fa24..71f8f8885 100755 --- a/testing/tests/swanctl/net2net-route/pretest.dat +++ b/testing/tests/swanctl/net2net-route/pretest.dat @@ -1,9 +1,10 @@ sun::iptables-restore < /etc/iptables.rules moon::iptables-restore < /etc/iptables.rules sun::service charon start 2> /dev/null -moon::service charon start 2> /dev/null +moon::service charon start 2> /dev/null +moon::sleep 1 sun::swanctl --load-creds 2> /dev/null moon::swanctl --load-creds 2> /dev/null sun::swanctl --load-conns 2> /dev/null moon::swanctl --load-conns 2> /dev/null -alice::ping -c 3 10.2.0.10 +alice::ping -c 3 10.2.0.10 diff --git a/testing/tests/swanctl/net2net-start/pretest.dat b/testing/tests/swanctl/net2net-start/pretest.dat index 0560092c5..5528eb70f 100755 --- a/testing/tests/swanctl/net2net-start/pretest.dat +++ b/testing/tests/swanctl/net2net-start/pretest.dat @@ -1,9 +1,10 @@ sun::iptables-restore < /etc/iptables.rules moon::iptables-restore < /etc/iptables.rules sun::service charon start 2> /dev/null -moon::service charon start 2> /dev/null +moon::service charon start 2> /dev/null +moon::sleep 1 sun::swanctl --load-creds 2> /dev/null moon::swanctl --load-creds 2> /dev/null sun::swanctl --load-conns 2> /dev/null moon::swanctl --load-conns 2> /dev/null -moon::sleep 1 +moon::sleep 1 diff --git a/testing/tests/swanctl/rw-cert/pretest.dat b/testing/tests/swanctl/rw-cert/pretest.dat index 3fdf01d81..75b359ac1 100755 --- a/testing/tests/swanctl/rw-cert/pretest.dat +++ b/testing/tests/swanctl/rw-cert/pretest.dat @@ -1,9 +1,10 @@ moon::iptables-restore < /etc/iptables.rules carol::iptables-restore < /etc/iptables.rules dave::iptables-restore < /etc/iptables.rules -moon::service charon start 2> /dev/null +moon::service charon start 2> /dev/null carol::service charon start 2> /dev/null dave::service charon start 2> /dev/null +moon::sleep 1 moon::swanctl --load-conns 2> /dev/null carol::swanctl --load-conns 2> /dev/null dave::swanctl --load-conns 2> /dev/null diff --git a/testing/tests/swanctl/rw-psk-fqdn/pretest.dat b/testing/tests/swanctl/rw-psk-fqdn/pretest.dat index 2018f5d95..7507ac355 100755 --- a/testing/tests/swanctl/rw-psk-fqdn/pretest.dat +++ b/testing/tests/swanctl/rw-psk-fqdn/pretest.dat @@ -4,9 +4,10 @@ dave::iptables-restore < /etc/iptables.rules moon::cd /etc/swanctl; rm rsa/* x509/* x509ca/* carol::cd /etc/swanctl; rm rsa/* x509/* x509ca/* dave::cd /etc/swanctl; rm rsa/* x509/* x509ca/* -moon::service charon start 2> /dev/null +moon::service charon start 2> /dev/null carol::service charon start 2> /dev/null dave::service charon start 2> /dev/null +moon::sleep 1 moon::swanctl --load-conns 2> /dev/null carol::swanctl --load-conns 2> /dev/null dave::swanctl --load-conns 2> /dev/null diff --git a/testing/tests/swanctl/rw-psk-ipv4/pretest.dat b/testing/tests/swanctl/rw-psk-ipv4/pretest.dat index 2018f5d95..7507ac355 100755 --- a/testing/tests/swanctl/rw-psk-ipv4/pretest.dat +++ b/testing/tests/swanctl/rw-psk-ipv4/pretest.dat @@ -4,9 +4,10 @@ dave::iptables-restore < /etc/iptables.rules moon::cd /etc/swanctl; rm rsa/* x509/* x509ca/* carol::cd /etc/swanctl; rm rsa/* x509/* x509ca/* dave::cd /etc/swanctl; rm rsa/* x509/* x509ca/* -moon::service charon start 2> /dev/null +moon::service charon start 2> /dev/null carol::service charon start 2> /dev/null dave::service charon start 2> /dev/null +moon::sleep 1 moon::swanctl --load-conns 2> /dev/null carol::swanctl --load-conns 2> /dev/null dave::swanctl --load-conns 2> /dev/null |