testing: Add expect-connection calls for all tests and hosts

There are some exceptions (e.g. those that use auto=start or p2pnat).

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

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

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

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

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

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

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

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

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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

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

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

@@ -6,5 +6,6 @@ carol::ipsec start
 dave::ipsec start
 dave::expect-connection peer
 dave::ipsec up peer
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home

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

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

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

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

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

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

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

@@ -7,7 +7,9 @@ dave::rm /etc/ipsec.d/cacerts/*
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
+moon::expect-connection rw-carol
 carol::expect-connection home
 carol::ipsec up home
+moon::expect-connection rw-dave
 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

@@ -4,6 +4,8 @@ dave::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
+moon::expect-connection rw-carol
+moon::expect-connection rw-dave
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

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

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

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

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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

@@ -2,5 +2,7 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
+moon::expect-connection finance
+moon::expect-connection sales
 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

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

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

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

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

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

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

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

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

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

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

@@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
+moon::expect-connection rw
 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

@@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
+moon::expect-connection rw
 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

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

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

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

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

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

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

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

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

@@ -4,6 +4,8 @@ alice::ipsec start
 moon::ipsec start
 sun::ipsec start
 bob::ipsec start
+alice::expect-connection remote
+sun::expect-connection remote
 moon::expect-connection alice
 moon::ping -n -c 3 -W 1 -i 0.2 -s 8184 -p deadbeef PH_IP_ALICE
 moon::ping -n -c 3 -W 1 -i 0.2 -s 8184 -p deadbeef PH_IP_SUN

testing/tests/ikev2/compress/pretest.dat

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

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

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

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

@@ -4,5 +4,6 @@ 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home

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

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

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

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

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

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

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

@@ -9,5 +9,5 @@ dave::ipsec start
 moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home
-carol::expect-connection home
+dave::expect-connection home
 dave::ipsec up home

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

@@ -7,5 +7,6 @@ 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
+bob::expect-connection nat-t
 alice::expect-connection nat-t
 alice::ipsec up nat-t

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

@@ -6,5 +6,6 @@ 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
+bob::expect-connection nat-t
 alice::expect-connection nat-t
 alice::ipsec up nat-t

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

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

testing/tests/ikev2/dpd-hold/pretest.dat

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

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

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

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

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

testing/tests/ikev2/esp-alg-md5-128/pretest.dat

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

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

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

testing/tests/ikev2/esp-alg-sha1-160/pretest.dat

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

testing/tests/ikev2/force-udp-encaps/pretest.dat

@@ -4,5 +4,6 @@ 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
+sun::expect-connection nat-t
 alice::expect-connection nat-t
 alice::ipsec up nat-t

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

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

testing/tests/ikev2/inactivity-timeout/pretest.dat

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

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

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

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

@@ -18,6 +18,8 @@ alice::ipsec start
 venus::ipsec start
 carol::ipsec start
 dave::ipsec start
+moon::expect-connection int
+moon::expect-connection ext
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

@@ -7,6 +7,8 @@ alice::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 alice::ipsec start
+moon::expect-connection int
+moon::expect-connection ext
 carol::expect-connection home
 carol::ipsec up home
 alice::expect-connection home

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

@@ -5,5 +5,6 @@ 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
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home

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

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

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

@@ -4,6 +4,8 @@ alice::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 alice::ipsec start
+moon::expect-connection int
+moon::expect-connection ext
 carol::expect-connection home
 carol::ipsec up home
 alice::expect-connection home

testing/tests/ikev2/mobike-nat/pretest.dat

@@ -6,4 +6,5 @@ moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-
 alice::ipsec start
 sun::ipsec start
 alice::expect-connection mobike
+sun::expect-connection mobike
 alice::ipsec up mobike

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

@@ -5,4 +5,5 @@ sun::ip route add 10.1.0.0/16 via PH_IP_MOON
 alice::ipsec start
 sun::ipsec start
 alice::expect-connection mobike
+sun::expect-connection mobike
 alice::ipsec up mobike

testing/tests/ikev2/mobike/pretest.dat

@@ -5,4 +5,5 @@ sun::ip route add 10.1.0.0/16 via PH_IP_MOON
 alice::ipsec start
 sun::ipsec start
 alice::expect-connection mobike
+sun::expect-connection mobike
 alice::ipsec up mobike

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

@@ -8,6 +8,7 @@ alice::radiusd
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
+moon::expect-connection rw-mult
 carol::expect-connection home
 carol::ipsec up home
 dave::expect-connection home

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

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

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

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

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

@@ -3,6 +3,8 @@ moon::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
 dave::ipsec start
+moon::expect-connection alice
+moon::expect-connection venus
 carol::expect-connection alice
 carol::expect-connection venus
 carol::ipsec up alice

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

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

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

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

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

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

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

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

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

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

testing/tests/ikev2/nat-rw-mark/pretest.dat

@@ -13,6 +13,8 @@ sun::iptables -t mangle -A PREROUTING -d PH_IP_DAVE10 -j MARK --set-mark 20
 sun::ipsec start
 alice::ipsec start
 venus::ipsec start
+sun::expect-connection alice
+sun::expect-connection venus
 alice::expect-connection nat-t
 alice::ipsec up nat-t
 venus::expect-connection nat-t

testing/tests/ikev2/nat-rw-psk/pretest.dat

@@ -9,6 +9,7 @@ sun::rm /etc/ipsec.d/cacerts/*
 sun::ipsec start
 alice::ipsec start
 venus::ipsec start
+sun::expect-connection nat-t
 alice::expect-connection nat-t
 alice::ipsec up nat-t
 venus::expect-connection nat-t

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

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

testing/tests/ikev2/net2net-pubkey/pretest.dat

@@ -4,5 +4,6 @@ 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
+sun::expect-connection net-net
 moon::ipsec up net-net

testing/tests/ikev2/net2net-rfc3779/pretest.dat

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

testing/tests/ikev2/net2net-route/pretest.dat

@@ -3,4 +3,5 @@ sun::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 sun::ipsec start
 moon::expect-connection net-net
+sun::expect-connection net-net
 alice::ping -c 3 -W 1 -i 0.2 PH_IP_BOB

testing/tests/ikev2/net2net-same-nets/pretest.dat

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

testing/tests/ikev2/ocsp-local-cert/pretest.dat

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

testing/tests/ikev2/ocsp-no-signer-cert/pretest.dat

@@ -1,5 +1,6 @@
 moon::iptables -I OUTPUT -d PH_IP_WINNETOU -p tcp --dport 80 -j REJECT --reject-with tcp-reset
 moon::ipsec start
 carol::ipsec start
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home

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

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

testing/tests/ikev2/ocsp-root-cert/pretest.dat

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

testing/tests/ikev2/ocsp-signer-cert/pretest.dat

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

testing/tests/ikev2/ocsp-timeouts-good/pretest.dat

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

testing/tests/ikev2/ocsp-timeouts-unknown/pretest.dat

@@ -2,5 +2,6 @@ moon::iptables -I OUTPUT -d PH_IP_WINNETOU -p tcp --dport 80 -j REJECT --reject-
 carol::iptables -I OUTPUT -d PH_IP_WINNETOU -p tcp --dport 80 -j REJECT --reject-with tcp-reset
 moon::ipsec start
 carol::ipsec start
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home

testing/tests/ikev2/ocsp-untrusted-cert/pretest.dat

@@ -1,5 +1,6 @@
 moon::iptables -I OUTPUT -d PH_IP_WINNETOU -p tcp --dport 80 -j REJECT --reject-with tcp-reset
 moon::ipsec start
 carol::ipsec start
+moon::expect-connection rw
 carol::expect-connection home
 carol::ipsec up home

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

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

testing/tests/ikev2/protoport-route/pretest.dat

@@ -2,6 +2,8 @@ moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 moon::ipsec start
 carol::ipsec start
+moon::expect-connection rw-icmp
+moon::expect-connection rw-ssh
 carol::expect-connection home-icmp
 carol::expect-connection home-ssh
 carol::ssh PH_IP_ALICE hostname

testing/tests/ikev2/reauth-early/pretest.dat

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

testing/tests/ikev2/reauth-late/pretest.dat

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

testing/tests/ikev2/reauth-mbb-revoked/pretest.dat

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

testing/tests/ikev2/reauth-mbb-virtual-ip/pretest.dat

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

testing/tests/ikev2/reauth-mbb/pretest.dat

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

testing/tests/ikev2/redirect-active/pretest.dat

@@ -8,6 +8,9 @@ moon::ipsec start
 alice::ipsec start
 carol::ipsec start
 dave::ipsec start
-carol::sleep 1
+moon::expect-connection rw
+alice::expect-connection rw
+carol::expect-connection home
 carol::ipsec up home
+dave::expect-connection home
 dave::ipsec up home

testing/tests/ikev2/rw-dnssec/pretest.dat

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

testing/tests/ikev2/rw-eap-aka-id-rsa/pretest.dat

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

testing/tests/ikev2/rw-eap-aka-rsa/pretest.dat

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

testing/tests/ikev2/rw-eap-dynamic/pretest.dat

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