denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
By consistently using the `expect-connection` helper we can avoid pretty
much all previously needed calls to sleep.
This commit is contained in:
Tobias Brunner
2015-11-09 15:18:35 +01:00
parent 747b64875f
commit f519acd42f
303 changed files with 500 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/tests/ikev2/rw-mark-in-out/pretest.dat
+5 -6
View File
@@ -1,8 +1,8 @@
alice::iptables-restore < /etc/iptables.rules
venus::iptables-restore < /etc/iptables.rules
sun::iptables-restore < /etc/iptables.rules
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to PH_IP_MOON
sun::ip route add 10.1.0.0/16 via PH_IP_MOON
moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to PH_IP_MOON
sun::ip route add 10.1.0.0/16 via PH_IP_MOON
sun::iptables -t nat -A POSTROUTING -o eth1 -m mark --mark 10 -j SNAT --to PH_IP_CAROL10
sun::iptables -t nat -A POSTROUTING -o eth1 -m mark --mark 20 -j SNAT --to PH_IP_DAVE10
sun::iptables -t mangle -A PREROUTING -d PH_IP_CAROL10 -j MARK --set-mark 11
@@ -10,8 +10,7 @@ sun::iptables -t mangle -A PREROUTING -d PH_IP_DAVE10 -j MARK --set-mark 21
alice::ipsec start
venus::ipsec start
sun::ipsec start
alice::sleep 2
alice::ipsec up home
venus::sleep 2
alice::expect-connection home
alice::ipsec up home
venus::expect-connection home
venus::ipsec up home
venus::sleep 2