aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/ikev2/dhcp-static-client-id
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2016-05-02 10:10:56 +0200
committerAndreas Steffen <andreas.steffen@strongswan.org>2016-05-15 19:02:57 +0200
commit141ac4df8f4976d0d0a6f651fad64e628d12b6e0 (patch)
tree1cb1017d8b15dc3155f88bb332eeb136ff12fa9b /testing/tests/ikev2/dhcp-static-client-id
parent1aeaccad119ab9db3b473bd88e25a550a17864ac (diff)
downloadstrongswan-141ac4df8f4976d0d0a6f651fad64e628d12b6e0.tar.bz2
strongswan-141ac4df8f4976d0d0a6f651fad64e628d12b6e0.tar.xz
testing: wait until connections are loaded
Diffstat (limited to 'testing/tests/ikev2/dhcp-static-client-id')
-rw-r--r--testing/tests/ikev2/dhcp-static-client-id/posttest.dat2
-rw-r--r--testing/tests/ikev2/dhcp-static-client-id/pretest.dat5
2 files changed, 4 insertions, 3 deletions
diff --git a/testing/tests/ikev2/dhcp-static-client-id/posttest.dat b/testing/tests/ikev2/dhcp-static-client-id/posttest.dat
index 7fff9981b..669f52e73 100644
--- a/testing/tests/ikev2/dhcp-static-client-id/posttest.dat
+++ b/testing/tests/ikev2/dhcp-static-client-id/posttest.dat
@@ -1,7 +1,7 @@
moon::ipsec stop
carol::ipsec stop
dave::ipsec stop
-venus::/etc/init.d/isc-dhcp-server stop 2> /dev/null
+venus::service isc-dhcp-server stop 2> /dev/null
moon::iptables-restore < /etc/iptables.flush
carol::iptables-restore < /etc/iptables.flush
dave::iptables-restore < /etc/iptables.flush
diff --git a/testing/tests/ikev2/dhcp-static-client-id/pretest.dat b/testing/tests/ikev2/dhcp-static-client-id/pretest.dat
index 8eafe1a9e..04bfd1b0d 100644
--- a/testing/tests/ikev2/dhcp-static-client-id/pretest.dat
+++ b/testing/tests/ikev2/dhcp-static-client-id/pretest.dat
@@ -2,10 +2,11 @@ moon::iptables-restore < /etc/iptables.rules
carol::iptables-restore < /etc/iptables.rules
dave::iptables-restore < /etc/iptables.rules
venus::cat /etc/dhcp/dhcpd.conf
-venus::/etc/init.d/isc-dhcp-server start 2> /dev/null
+venus::service isc-dhcp-server start 2> /dev/null
+moon::ipsec start
carol::ipsec start
dave::ipsec start
-moon::ipsec start
+moon::expect-connection rw
carol::expect-connection home
carol::ipsec up home
carol::expect-connection home