testing: Remove nearly all sleep calls from pretest and posttest scripts

By consistently using the `expect-connection` helper we can avoid pretty
much all previously needed calls to sleep.

testing/tests/af-alg/alg-camellia/pretest.dat

@@ -2,6 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home
-carol::sleep 1

testing/tests/af-alg/rw-cert/pretest.dat

@@ -4,6 +4,8 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 3
+moon::expect-connection rw
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
-dave::ipsec up home
+dave::ipsec up home

testing/tests/gcrypt-ikev1/alg-serpent/pretest.dat

@@ -1,4 +1,4 @@
 carol::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/gcrypt-ikev1/alg-twofish/pretest.dat

@@ -1,4 +1,4 @@
 carol::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/gcrypt-ikev2/alg-camellia/pretest.dat

@@ -2,6 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home
-carol::sleep 1

testing/tests/gcrypt-ikev2/rw-cert/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 3
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home

testing/tests/ha/active-passive/pretest.dat

@@ -12,10 +12,11 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 alice::ipsec start
 moon::ipsec start
-moon::sleep 2 
+moon::sleep 2
 alice::echo "+1" > /var/run/charon.ha
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home

testing/tests/ha/both-active/pretest.dat

@@ -14,6 +14,7 @@ alice::ipsec start
 alice::sleep 1
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home

testing/tests/ike/rw-cert/pretest.dat

@@ -1,7 +1,7 @@
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1 
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home
-dave::sleep 1

testing/tests/ike/rw_v1-net_v2/pretest.dat

@@ -1,7 +1,7 @@
 moon::ipsec start
 sun::ipsec start
 carol::ipsec start
-moon::sleep 1 
+moon::expect-connection net-net
+carol::expect-connection home
 moon::ipsec up net-net
 carol::ipsec up home
-moon::sleep 1

testing/tests/ikev1/alg-3des-md5/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/alg-blowfish/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home

testing/tests/ikev1/alg-modp-subgroup/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home

testing/tests/ikev1/alg-sha256/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/alg-sha384/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/alg-sha512/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/compress/pretest.dat

@@ -1,4 +1,4 @@
 carol::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/config-payload-push/pretest.dat

@@ -4,7 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev1/config-payload/pretest.dat

@@ -4,7 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
+dave::expect-connection home
 carol::ipsec up home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev1/double-nat-net/pretest.dat

@@ -7,6 +7,5 @@ sun::iptables -t nat -A PREROUTING -i eth0 -s PH_IP_MOON -p udp -j DNAT --to-des
 sun::ip route add 10.1.0.0/16 via PH_IP_BOB
 alice::ipsec start
 bob::ipsec start
-alice::sleep 2
+alice::expect-connection nat-t
 alice::ipsec up nat-t
-alice::sleep 1

testing/tests/ikev1/double-nat/pretest.dat

@@ -6,6 +6,5 @@ sun::iptables -t nat -A POSTROUTING -o eth0 -s 10.2.0.0/16 -p tcp -j SNAT --to-s
 sun::iptables -t nat -A PREROUTING -i eth0 -s PH_IP_MOON -p udp -j DNAT --to-destination PH_IP_BOB
 alice::ipsec start
 bob::ipsec start
-alice::sleep 2
+alice::expect-connection nat-t
 alice::ipsec up nat-t
-alice::sleep 1

testing/tests/ikev1/dpd-clear/pretest.dat

@@ -1,4 +1,4 @@
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/dpd-restart/evaltest.dat

@@ -8,6 +8,6 @@ carol::cat /var/log/daemon.log::DPD check timed out, enforcing DPD action::YES
 carol::cat /var/log/daemon.log::restarting CHILD_SA home::YES
 carol::iptables -D INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
 moon:: iptables -D INPUT -i eth0 -s PH_IP_CAROL -j DROP::no output expected::NO
-carol::sleep 1::no output expected::NO
+carol::sleep 2::no output expected::NO
 carol::ipsec status 2> /dev/null::home.*INSTALLED, TUNNEL::YES
 moon:: ipsec status 2> /dev/null::rw.*INSTALLED, TUNNEL::YES

testing/tests/ikev1/dpd-restart/pretest.dat

@@ -1,4 +1,4 @@
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/dynamic-initiator/posttest.dat

@@ -1,6 +1,5 @@
 dave::ipsec stop
 carol::ipsec stop
-dave::sleep 1
 moon::ipsec stop
 carol::iptables-restore < /etc/iptables.flush
 dave::rm /etc/ipsec.d/certs/*

testing/tests/ikev1/dynamic-initiator/pretest.dat

@@ -2,10 +2,9 @@ carol::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection moon
 carol::ipsec up moon
-carol::sleep 1
 carol::iptables -D INPUT  -i eth0 -p udp --dport 500 --sport 500 -j ACCEPT
 carol::iptables -D OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
+dave::expect-connection moon
 dave::ipsec up moon
-dave::sleep 2

testing/tests/ikev1/dynamic-responder/posttest.dat

@@ -1,6 +1,5 @@
 dave::ipsec stop
 carol::ipsec stop
-dave::sleep 1
 moon::ipsec stop
 carol::iptables-restore < /etc/iptables.flush
 dave::rm /etc/ipsec.d/certs/*

testing/tests/ikev1/dynamic-responder/pretest.dat

@@ -2,10 +2,11 @@ carol::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-moon::sleep 2
+moon::expect-connection carol
 moon::ipsec up carol
-moon::sleep 1
+moon::sleep 0.5
 carol::iptables -D INPUT  -i eth0 -p udp --dport 500 --sport 500 -j ACCEPT
 carol::iptables -D OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
+dave::expect-connection moon
 dave::ipsec up moon
-dave::sleep 2
+moon::sleep 0.5

testing/tests/ikev1/dynamic-two-peers/posttest.dat

@@ -1,6 +1,5 @@
 carol::ipsec stop
 dave::ipsec stop
-moon::sleep 1
 moon::ipsec stop
 moon::mv /etc/hosts.ori /etc/hosts
 moon::iptables-restore < /etc/iptables.flush

testing/tests/ikev1/dynamic-two-peers/pretest.dat

@@ -6,7 +6,7 @@ dave::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection moon
+dave::expect-connection moon
 carol::ipsec up moon
 dave::ipsec up moon
-carol::sleep 1

testing/tests/ikev1/esp-alg-aes-ccm/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/esp-alg-aes-ctr/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/esp-alg-aes-gcm/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/esp-alg-aes-gmac/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/esp-alg-aes-xcbc/pretest.dat

@@ -1,4 +1,4 @@
 carol::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/esp-alg-null/pretest.dat

@@ -2,6 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home
-carol::sleep 1

testing/tests/ikev1/host2host-ah/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 2
+moon::expect-connection host-host
 moon::ipsec up host-host

testing/tests/ikev1/host2host-cert/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1 
+moon::expect-connection host-host
 moon::ipsec up host-host

testing/tests/ikev1/host2host-transport/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 2
+moon::expect-connection host-host
 moon::ipsec up host-host

testing/tests/ikev1/ip-pool-db/pretest.dat

@@ -7,10 +7,10 @@ moon::ipsec pool --addattr nbns --server PH_IP_VENUS 2> /dev/null
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
+moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev1/ip-pool/pretest.dat

@@ -4,7 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev1/multi-level-ca-cr-init/pretest.dat

@@ -1,6 +1,7 @@
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-moon::sleep 2
+moon::expect-connection alice
+moon::expect-connection venus
 moon::ipsec up alice
 moon::ipsec up venus

testing/tests/ikev1/multi-level-ca-cr-resp/pretest.dat

@@ -1,6 +1,7 @@
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection alice
 carol::ipsec up alice
+dave::expect-connection venus
 dave::ipsec up venus

testing/tests/ikev1/multi-level-ca/pretest.dat

@@ -1,8 +1,11 @@
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection alice
+carol::expect-connection venus
 carol::ipsec up alice
 carol::ipsec up venus
+dave::expect-connection alice
+dave::expect-connection venus
 dave::ipsec up venus
 dave::ipsec up alice

testing/tests/ikev1/nat-rw/pretest.dat

@@ -6,8 +6,7 @@ moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-
 alice::ipsec start
 venus::ipsec start
 sun::ipsec start
-alice::sleep 2 
+alice::expect-connection nat-t
 alice::ipsec up nat-t
-venus::sleep 2 
+venus::expect-connection nat-t
 venus::ipsec up nat-t
-venus::sleep 2

testing/tests/ikev1/nat-virtual-ip/pretest.dat

@@ -2,6 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1
+moon::expect-connection net-net
 moon::ipsec up net-net
-moon::sleep 1

testing/tests/ikev1/net2net-ah/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev1/net2net-cert/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1 
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev1/net2net-fragmentation/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1 
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev1/net2net-ntru-cert/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1 
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev1/net2net-psk-fail/pretest.dat

@@ -4,5 +4,5 @@ moon::rm /etc/ipsec.d/cacerts/*
 sun::rm /etc/ipsec.d/cacerts/*
 moon::ipsec start
 sun::ipsec start
-moon::sleep 2
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev1/net2net-psk/pretest.dat

@@ -4,5 +4,5 @@ moon::rm /etc/ipsec.d/cacerts/*
 sun::rm /etc/ipsec.d/cacerts/*
 moon::ipsec start
 sun::ipsec start
-moon::sleep 2
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev1/protoport-dual/pretest.dat

@@ -2,6 +2,7 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2
+carol::expect-connection home-icmp
+carol::expect-connection home-ssh
 carol::ipsec up home-icmp
 carol::ipsec up home-ssh

testing/tests/ikev1/rw-cert-aggressive/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/rw-cert-unity/pretest.dat

@@ -1,4 +1,4 @@
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/rw-cert/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/rw-initiator-only/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+dave::expect-connection peer
 dave::ipsec up peer
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev1/rw-ntru-psk/pretest.dat

@@ -7,7 +7,7 @@ dave::rm /etc/ipsec.d/cacerts/*
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev1/rw-psk-aggressive/pretest.dat

@@ -7,6 +7,7 @@ dave::rm /etc/ipsec.d/cacerts/*
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/rw-psk-fqdn/pretest.dat

@@ -4,9 +4,10 @@ dave::iptables-restore < /etc/iptables.rules
 moon::rm /etc/ipsec.d/cacerts/*
 carol::rm /etc/ipsec.d/cacerts/*
 dave::rm /etc/ipsec.d/cacerts/*
+moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/rw-psk-ipv4/pretest.dat

@@ -7,6 +7,7 @@ dave::rm /etc/ipsec.d/cacerts/*
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/virtual-ip/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/xauth-id-psk-config/pretest.dat

@@ -7,6 +7,7 @@ dave::rm /etc/ipsec.d/cacerts/*
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/xauth-id-rsa-aggressive/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/xauth-id-rsa-config/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/xauth-id-rsa-hybrid/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/xauth-psk/pretest.dat

@@ -7,6 +7,7 @@ dave::rm /etc/ipsec.d/cacerts/*
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev1/xauth-rsa-eap-md5-radius/pretest.dat

@@ -3,6 +3,5 @@ carol::iptables-restore < /etc/iptables.rules
 alice::radiusd
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
-carol::sleep 1

testing/tests/ikev1/xauth-rsa-radius/pretest.dat

@@ -3,6 +3,5 @@ carol::iptables-restore < /etc/iptables.rules
 alice::radiusd
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
-carol::sleep 1

testing/tests/ikev1/xauth-rsa/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev2/acert-cached/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev2/acert-fallback/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/acert-inline/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev2/after-2038-certs/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-3des-md5/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-aes-ccm/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-aes-ctr/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-aes-gcm/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-aes-xcbc/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-blowfish/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev2/alg-chacha20poly1305/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-modp-subgroup/pretest.dat

@@ -4,6 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev2/alg-sha256-96/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-sha256/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-sha384/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/alg-sha512/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/any-interface/pretest.dat

@@ -4,7 +4,8 @@ alice::ipsec start
 moon::ipsec start
 sun::ipsec start
 bob::ipsec start
-moon::sleep 2 
+moon::expect-connection alice
 moon::ping -n -c 3 -s 8184 -p deadbeef PH_IP_ALICE
 moon::ping -n -c 3 -s 8184 -p deadbeef PH_IP_SUN
+bob::expect-connection sun
 bob::ping -n -c 3 -s 8184 -p deadbeef PH_IP_SUN1

testing/tests/ikev2/compress/pretest.dat

@@ -2,5 +2,5 @@ carol::iptables-restore < /etc/iptables.rules
 moon::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/config-payload-swapped/pretest.dat

@@ -4,7 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev2/config-payload/pretest.dat

@@ -4,7 +4,7 @@ dave::iptables-restore < /etc/iptables.rules
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2 
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev2/critical-extension/pretest.dat

@@ -2,5 +2,5 @@ moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1 
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev2/crl-from-cache/pretest.dat

@@ -4,5 +4,5 @@ carol::wget -q http://crl.strongswan.org/strongswan.crl
 carol::mv strongswan.crl /etc/ipsec.d/crls/5da7dd700651327ee7b66db3b5e5e060ea2e4def.crl
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/crl-ldap/pretest.dat

@@ -3,6 +3,5 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
-carol::sleep 3 

testing/tests/ikev2/crl-revoked/pretest.dat

@@ -1,4 +1,4 @@
 moon::ipsec start
 carol::ipsec start
-carol::sleep 1 
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/crl-to-cache/pretest.dat

@@ -1,4 +1,4 @@
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/default-keys/pretest.dat

@@ -10,10 +10,10 @@ moon::rm /etc/ipsec.d/private/*
 moon::rm /etc/ipsec.d/certs/*
 moon::rm /etc/ipsec.d/cacerts/*
 moon::ipsec start
-moon::sleep 5
+moon::expect-connection carol
 moon::scp /etc/ipsec.d/certs/selfCert.der carol:/etc/ipsec.d/certs/peerCert.der
 moon::scp carol:/etc/ipsec.d/certs/selfCert.der /etc/ipsec.d/certs/peerCert.der
 moon::ipsec reload
 carol::ipsec reload
-carol::sleep 1
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/dhcp-dynamic/pretest.dat

@@ -6,7 +6,7 @@ venus::/etc/init.d/isc-dhcp-server start 2> /dev/null
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev2/dhcp-static-client-id/pretest.dat

@@ -6,7 +6,7 @@ venus::/etc/init.d/isc-dhcp-server start 2> /dev/null
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+carol::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev2/dhcp-static-mac/pretest.dat

@@ -6,7 +6,7 @@ venus::/etc/init.d/isc-dhcp-server start 2> /dev/null
 carol::ipsec start
 dave::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home
-carol::sleep 1

testing/tests/ikev2/double-nat-net/pretest.dat

@@ -7,6 +7,5 @@ sun::iptables -t nat -A PREROUTING -i eth0 -s PH_IP_MOON -p udp -j DNAT --to-des
 sun::ip route add 10.1.0.0/16 via PH_IP_BOB
 alice::ipsec start
 bob::ipsec start
-alice::sleep 2
+alice::expect-connection nat-t
 alice::ipsec up nat-t
-alice::sleep 1