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/tnc/tnccs-11-fhh/pretest.dat
+2 -2
View File
@@ -9,7 +9,7 @@ dave::cat /etc/tnc/dummyimc.file
moon::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
carol::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
dave::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties 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/tnc/tnccs-11-radius-block/pretest.dat
+2 -2
View File
@@ -8,7 +8,7 @@ alice::LEAK_DETECTIVE_DISABLE=1 LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.propertie
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/tnc/tnccs-11-radius-pts/pretest.dat
+2 -2
View File
@@ -14,9 +14,9 @@ dave::cat /etc/tnc_config
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
alice::ipsec attest --sessions
alice::ipsec attest --devices
testing/tests/tnc/tnccs-11-radius/pretest.dat
+2 -2
View File
@@ -10,7 +10,7 @@ dave::cat /etc/tnc_config
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/tnc/tnccs-11-supplicant/pretest.dat
+1 -1
View File
@@ -6,6 +6,6 @@ carol::cat /etc/tnc_config
dave::cat /etc/tnc_config
moon::hostapd -B /etc/hostapd/hostapd.conf
carol::LEAK_DETECTIVE_DISABLE=1 LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties wpa_supplicant -B -c /etc/wpa_supplicant.conf -D wired -i eth0
carol::sleep 4
carol::sleep 4
dave::LEAK_DETECTIVE_DISABLE=1 LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties wpa_supplicant -B -c /etc/wpa_supplicant.conf -D wired -i eth0
dave::sleep 4
testing/tests/tnc/tnccs-11/pretest.dat
+2 -2
View File
@@ -7,7 +7,7 @@ dave::cat /etc/tnc_config
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/tnc/tnccs-20-block/pretest.dat
+2 -2
View File
@@ -8,7 +8,7 @@ dave::cat /etc/tnc_config
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/tnc/tnccs-20-client-retry/pretest.dat
+4 -4
View File
@@ -5,9 +5,9 @@ moon::cat /etc/tnc_config
carol::cat /etc/tnc_config
dave::cat /etc/tnc_config
moon::ipsec start
carol::ipsec start
dave::ipsec start
carol::sleep 1
carol::ipsec start
dave::ipsec start
carol::expect-connection home
carol::ipsec up home
dave::expect-connection home
dave::ipsec up home
dave::sleep 1
testing/tests/tnc/tnccs-20-fail-init/pretest.dat
+3 -2
View File
@@ -5,8 +5,9 @@ moon::cat /etc/tnc_config
carol::cat /etc/tnc_config
dave::cat /etc/tnc_config
moon::ipsec start
carol::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/tnc/tnccs-20-fail-resp/pretest.dat
+2 -2
View File
@@ -3,6 +3,6 @@ carol::iptables-restore < /etc/iptables.rules
moon::cat /etc/tnc_config
carol::cat /etc/tnc_config
moon::ipsec start
carol::ipsec start
carol::sleep 1
carol::ipsec start
carol::expect-connection home
carol::ipsec up home
testing/tests/tnc/tnccs-20-fhh/pretest.dat
+5 -4
View File
@@ -8,9 +8,10 @@ carol::cat /etc/tnc/dummyimc.file
dave::cat /etc/tnc/dummyimc.file
moon::cat /etc/tnc/dummyimv.policy
moon::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
carol::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
dave::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
carol::sleep 1
carol::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
dave::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
moon::expect-connection rw-allow
carol::expect-connection home
carol::ipsec up home
dave::expect-connection home
dave::ipsec up home
dave::sleep 1
testing/tests/tnc/tnccs-20-hcd-eap/pretest.dat
+2 -2
View File
@@ -11,7 +11,7 @@ alice::ipsec start
moon::ipsec start
carol::ipsec start
dave::ipsec start
dave::sleep 1
carol::expect-connection home
carol::ipsec up home
dave::expect-connection home
dave::ipsec up home
dave::sleep 1
testing/tests/tnc/tnccs-20-mutual-eap/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 1
moon::expect-connection host-host
moon::ipsec up host-host
testing/tests/tnc/tnccs-20-mutual-pt-tls/pretest.dat
+2 -2
View File
@@ -1,4 +1,4 @@
sun::ipsec start
moon::cat /etc/pts/options
moon::sleep 1
moon::ipsec pt-tls-client --optionsfrom /etc/pts/options
sun::expect-connection pdp
moon::ipsec pt-tls-client --optionsfrom /etc/pts/options
testing/tests/tnc/tnccs-20-os-pts/pretest.dat
+2 -2
View File
@@ -11,9 +11,9 @@ dave::cat /etc/tnc_config
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
moon::ipsec attest --sessions
moon::ipsec attest --devices
testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat
+2 -1
View File
@@ -16,7 +16,8 @@ alice::ipsec start
moon::ipsec start
dave::ipsec start
carol::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/tnc/tnccs-20-pdp-pt-tls/pretest.dat
+1 -2
View File
@@ -13,7 +13,7 @@ alice::chgrp www-data /etc/pts/config.db; chmod g+w /etc/pts/config.db
alice::/var/www/tnc/manage.py setpassword strongSwan strongSwan
alice::service apache2 start
alice::ipsec start
alice::sleep 1
alice::expect-connection aaa
winnetou::ip route add 10.1.0.0/16 via 192.168.0.1
dave::ip route add 10.1.0.0/16 via 192.168.0.1
dave::cat /etc/pts/options
@@ -21,4 +21,3 @@ dave::ipsec pt-tls-client --optionsfrom /etc/pts/options
carol::ip route add 10.1.0.0/16 via 192.168.0.1
carol::cat /etc/pts/options
carol::ipsec pt-tls-client --optionsfrom /etc/pts/options
carol::sleep 1
testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat
+2 -2
View File
@@ -11,9 +11,9 @@ dave::cat /etc/tnc_config
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
moon::ipsec attest --sessions
moon::ipsec attest --devices
testing/tests/tnc/tnccs-20-pts/pretest.dat
+2 -2
View File
@@ -11,9 +11,9 @@ dave::cat /etc/tnc_config
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
moon::ipsec attest --sessions
moon::ipsec attest --devices
testing/tests/tnc/tnccs-20-server-retry/pretest.dat
+4 -4
View File
@@ -5,9 +5,9 @@ moon::cat /etc/tnc_config
carol::cat /etc/tnc_config
dave::cat /etc/tnc_config
moon::ipsec start
carol::ipsec start
dave::ipsec start
carol::sleep 1
carol::ipsec start
dave::ipsec start
carol::expect-connection home
carol::ipsec up home
dave::expect-connection home
dave::ipsec up home
dave::sleep 1
testing/tests/tnc/tnccs-20-tls/pretest.dat
+2 -2
View File
@@ -7,7 +7,7 @@ dave::cat /etc/tnc_config
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/tnc/tnccs-20/pretest.dat
+4 -4
View File
@@ -5,9 +5,9 @@ moon::cat /etc/tnc_config
carol::cat /etc/tnc_config
dave::cat /etc/tnc_config
moon::ipsec start
carol::ipsec start
dave::ipsec start
carol::sleep 1
carol::ipsec start
dave::ipsec start
carol::expect-connection home
carol::ipsec up home
dave::expect-connection home
dave::ipsec up home
dave::sleep 1
testing/tests/tnc/tnccs-dynamic/pretest.dat
+2 -2
View File
@@ -7,7 +7,7 @@ dave::cat /etc/tnc_config
moon::LEAK_DETECTIVE_DISABLE=1 ipsec start
carol::LEAK_DETECTIVE_DISABLE=1 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