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/sql/ip-pool-db-expired/pretest.dat
+2 -1
View File
@@ -14,6 +14,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/sql/ip-pool-db-restart/pretest.dat
+2 -2
View File
@@ -14,7 +14,7 @@ dave::iptables-restore < /etc/iptables.rules
moon::ipsec start
carol::ipsec start
dave::ipsec start
carol::sleep 1
dave::expect-connection home
dave::ipsec up home
carol::expect-connection home
carol::ipsec up home
carol::sleep 1
testing/tests/sql/ip-pool-db/pretest.dat
+2 -2
View File
@@ -13,7 +13,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
dave::sleep 1
testing/tests/sql/ip-split-pools-db-restart/pretest.dat
+2 -2
View File
@@ -12,7 +12,7 @@ moon::ipsec pool --leases 2> /dev/null
moon::ipsec start
dave::ipsec start
carol::ipsec start
dave::sleep 1
dave::expect-connection home
dave::ipsec up home
carol::expect-connection home
carol::ipsec up home
carol::sleep 1
testing/tests/sql/ip-split-pools-db/pretest.dat
+2 -2
View File
@@ -11,7 +11,7 @@ moon::ipsec pool --status 2> /dev/null
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/sql/multi-level-ca/pretest.dat
+2 -1
View File
@@ -13,6 +13,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/sql/net2net-cert/pretest.dat
+1 -1
View File
@@ -8,5 +8,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/sql/net2net-psk/pretest.dat
+1 -1
View File
@@ -8,5 +8,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/sql/net2net-route-pem/pretest.dat
+1 -1
View File
@@ -8,6 +8,6 @@ moon::iptables-restore < /etc/iptables.rules
sun::iptables-restore < /etc/iptables.rules
sun::ipsec start
moon::ipsec start
moon::sleep 1
moon::expect-connection net-net
alice::ping -c 1 PH_IP_BOB
bob::ping -c 1 PH_IP_VENUS
testing/tests/sql/net2net-start-pem/pretest.dat
+1 -1
View File
@@ -8,4 +8,4 @@ moon::iptables-restore < /etc/iptables.rules
sun::iptables-restore < /etc/iptables.rules
sun::ipsec start
moon::ipsec start
moon::sleep 3
moon::sleep 1
testing/tests/sql/rw-cert/pretest.dat
+2 -1
View File
@@ -13,6 +13,7 @@ dave::iptables-restore < /etc/iptables.rules
moon::ipsec start
carol::ipsec start
dave::ipsec start
carol::sleep 3
carol::expect-connection home
carol::ipsec up home
dave::expect-connection home
dave::ipsec up home
testing/tests/sql/rw-eap-aka-rsa/pretest.dat
+1 -1
View File
@@ -8,5 +8,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/sql/rw-psk-ipv4/pretest.dat
+2 -1
View File
@@ -13,6 +13,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/sql/rw-psk-ipv6/pretest.dat
+2 -1
View File
@@ -19,6 +19,7 @@ dave::"ip route add fec1:\:/16 via fec0:\:1"
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/sql/rw-psk-rsa-split/pretest.dat
+2 -1
View File
@@ -13,6 +13,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/sql/rw-rsa-keyid/pretest.dat
+2 -1
View File
@@ -13,6 +13,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/sql/rw-rsa/pretest.dat
+2 -1
View File
@@ -13,6 +13,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