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/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

testing/tests/ikev2/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/ikev2/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/ikev2/dpd-hold/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/dpd-restart/evaltest.dat

@@ -8,6 +8,6 @@ carol::cat /var/log/daemon.log::retransmit.*of request::YES
 carol::cat /var/log/daemon.log::giving up after.*retransmits::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/ikev2/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/ikev2/dynamic-initiator/posttest.dat

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

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

@@ -4,10 +4,9 @@ dave::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/ikev2/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/ikev2/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
 carol::ipsec up moon
+dave::expect-connection moon
 dave::ipsec up moon
-carol::sleep 1

testing/tests/ikev2/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/ikev2/esp-alg-md5-128/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/ikev2/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/ikev2/esp-alg-sha1-160/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/ikev2/farp/pretest.dat

@@ -6,7 +6,7 @@ alice::arp -d 10.1.0.40
 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/force-udp-encaps/pretest.dat

@@ -4,7 +4,5 @@ sun::ip route add 10.1.0.0/16 via PH_IP_MOON
 winnetou::ip route add 10.1.0.0/16 via PH_IP_MOON
 alice::ipsec start
 sun::ipsec start
-alice::sleep 4
+alice::expect-connection nat-t
 alice::ipsec up nat-t
-alice::sleep 1 
-

testing/tests/ikev2/forecast/pretest.dat

@@ -1,7 +1,7 @@
 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/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/ikev2/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/ikev2/host2host-swapped/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/ikev2/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/ikev2/inactivity-timeout/pretest.dat

@@ -1,6 +1,5 @@
 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/ikev2/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/ikev2/ip-pool-wish/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
-dave::sleep 1

testing/tests/ikev2/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/ikev2/ip-split-pools-db/pretest.dat

@@ -6,7 +6,7 @@ moon::ipsec pool --status 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/ip-two-pools-db/pretest.dat

@@ -18,9 +18,11 @@ venus::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
+alice::expect-connection home
 alice::ipsec up home
+venus::expect-connection home
 venus::ipsec up home
-alice::sleep 1

testing/tests/ikev2/ip-two-pools-mixed/pretest.dat

@@ -4,10 +4,10 @@ moon::ipsec pool --add intpool --start 10.4.0.1 --end 10.4.1.244 --timeout  0 2>
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 alice::iptables-restore < /etc/iptables.rules
-carol::ipsec start
 moon::ipsec start
+carol::ipsec start
 alice::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home
+alice::expect-connection home
 alice::ipsec up home
-alice::sleep 1

testing/tests/ikev2/ip-two-pools-v4v6-db/pretest.dat

@@ -5,5 +5,5 @@ moon::ipsec pool --add v6_pool --start fec3:\:1 --end fec3:\:fe --timeout  48 2>
 alice::ip -6 route add default via fec1:\:1
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/ip-two-pools-v4v6/pretest.dat

@@ -1,5 +1,5 @@
 alice::ip -6 route add default via fec1:\:1
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/ip-two-pools/pretest.dat

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

testing/tests/ikev2/lookip/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/mobike-nat/pretest.dat

@@ -5,6 +5,5 @@ moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p udp -j SNAT --to-
 moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-source PH_IP_MOON:2000-2100
 alice::ipsec start
 sun::ipsec start
-alice::sleep 2
+alice::expect-connection mobike
 alice::ipsec up mobike
-alice::sleep 1

testing/tests/ikev2/mobike-virtual-ip/pretest.dat

@@ -4,6 +4,5 @@ sun::iptables-restore < /etc/iptables.rules
 sun::ip route add 10.1.0.0/16 via PH_IP_MOON
 alice::ipsec start
 sun::ipsec start
-alice::sleep 2
+alice::expect-connection mobike
 alice::ipsec up mobike
-alice::sleep 1

testing/tests/ikev2/mobike/pretest.dat

@@ -4,6 +4,5 @@ sun::iptables-restore < /etc/iptables.rules
 sun::ip route add 10.1.0.0/16 via PH_IP_MOON
 alice::ipsec start
 sun::ipsec start
-alice::sleep 2
+alice::expect-connection mobike
 alice::ipsec up mobike
-alice::sleep 1

testing/tests/ikev2/mult-auth-rsa-eap-sim-id/pretest.dat

@@ -8,7 +8,7 @@ alice::radiusd
 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
-dave::sleep 1

testing/tests/ikev2/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/ikev2/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/ikev2/multi-level-ca-ldap/pretest.dat

@@ -3,8 +3,11 @@ moon::iptables-restore < /etc/iptables.rules
 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/ikev2/multi-level-ca-loop/pretest.dat

@@ -1,5 +1,5 @@
 moon::rm /etc/ipsec.d/cacerts/strongswanCert.pem
 carol::ipsec start
 moon::ipsec start
-carol::sleep 2
+carol::expect-connection alice
 carol::ipsec up alice

testing/tests/ikev2/multi-level-ca-pathlen/pretest.dat

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

testing/tests/ikev2/multi-level-ca-revoked/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/multi-level-ca-strict/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/ikev2/multi-level-ca/posttest.dat

@@ -2,4 +2,3 @@ moon::ipsec stop
 carol::ipsec stop
 dave::ipsec stop
 moon::rm /etc/ipsec.d/cacerts/*
-

testing/tests/ikev2/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/ikev2/nat-rw-mark/pretest.dat

@@ -13,8 +13,7 @@ sun::iptables -t mangle -A PREROUTING -d PH_IP_DAVE10 -j MARK --set-mark 20
 sun::ipsec start
 alice::ipsec start
 venus::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/ikev2/nat-rw-psk/pretest.dat

@@ -9,8 +9,7 @@ sun::rm /etc/ipsec.d/cacerts/*
 sun::ipsec start
 alice::ipsec start
 venus::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/ikev2/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/ikev2/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/ikev2/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/ikev2/net2net-cert-sha2/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/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/ikev2/net2net-dnscert/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/ikev2/net2net-dnssec/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/ikev2/net2net-esn/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/net2net-ntru-bandwidth/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/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/ikev2/net2net-pgp-v3/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/ikev2/net2net-pgp-v4/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/ikev2/net2net-pkcs12/pretest.dat

@@ -6,5 +6,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/net2net-psk-dscp/pretest.dat

@@ -9,9 +9,10 @@ moon::iptables -t mangle -A PREROUTING -m dscp --dscp-class EF -j MARK --set-mar
 bob::iptables -t mangle -A OUTPUT -d PH_IP_ALICE -p icmp -j DSCP --set-dscp-class BE
 bob::iptables -t mangle -A OUTPUT -d PH_IP_VENUS -p icmp -j DSCP --set-dscp-class EF
 sun::iptables -t mangle -A PREROUTING -m dscp --dscp-class BE -j MARK --set-mark 10
-sun::iptables -t mangle -A PREROUTING -m dscp --dscp-class EF -j MARK --set-mark 20 
+sun::iptables -t mangle -A PREROUTING -m dscp --dscp-class EF -j MARK --set-mark 20
 moon::ipsec start
 sun::ipsec start
-moon::sleep 1
+moon::expect-connection dscp-be
+moon::expect-connection dscp-ef
 moon::ipsec up dscp-be
 moon::ipsec up dscp-ef

testing/tests/ikev2/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 1 
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev2/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 1 
+moon::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev2/net2net-rfc3779/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/ikev2/net2net-route/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 net-net
 alice::ping -c 10 PH_IP_BOB

testing/tests/ikev2/net2net-rsa/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/ikev2/net2net-same-nets/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/net2net-start/pretest.dat

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

testing/tests/ikev2/ocsp-local-cert/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/ocsp-multi-level/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/ikev2/ocsp-no-signer-cert/pretest.dat

@@ -1,5 +1,5 @@
 moon::iptables -I OUTPUT -d PH_IP_WINNETOU -p tcp --dport 80 -j DROP
 moon::ipsec start
 carol::ipsec start
-carol::sleep 2
+carol::expect-connection home
 carol::ipsec up home