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/pfkey/alg-aes-xcbc/pretest.dat
+1 -1
View File
@@ -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/pfkey/alg-sha384/pretest.dat
+1 -1
View File
@@ -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/pfkey/alg-sha512/pretest.dat
+1 -1
View File
@@ -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/pfkey/compress/pretest.dat
+1 -1
View File
@@ -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/pfkey/esp-alg-null/pretest.dat
+1 -1
View File
@@ -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/pfkey/host2host-transport/pretest.dat
+1 -1
View File
@@ -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/pfkey/nat-rw/pretest.dat
+2 -3
View File
@@ -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/pfkey/net2net-route/pretest.dat
+1 -1
View File
@@ -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/pfkey/protoport-dual/pretest.dat
+2 -1
View File
@@ -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::ipsec up home-icmp
carol::expect-connection home-ssh
carol::ipsec up home-ssh
testing/tests/pfkey/protoport-route/pretest.dat
+2 -2
View File
@@ -2,7 +2,7 @@ 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-icmp
carol::expect-connection home-ssh
carol::ssh PH_IP_ALICE hostname
carol::ping -c 1 PH_IP_ALICE > /dev/null
carol::sleep 2
testing/tests/pfkey/rw-cert/pretest.dat
+3 -1
View File
@@ -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
carol::ipsec up home
dave::expect-connection home
dave::ipsec up home