Increase server delay for fake server tests

Doesn't look like 1 second is enough of a delay in all cases.
Increase it and hopefully the tests will stop being so flaky.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/tests/auth-multicert b/tests/auth-multicert
index a009957b7b7cc12ac300e7b27079e33f07232d46..005b511a2d7230f43fab4afbbfb311f5dcfd30c9 100755 (executable)
--- a/tests/auth-multicert
+++ b/tests/auth-multicert
@@ -37,7 +37,7 @@ echo "Testing multiple certificate authentication against fake Cisco server ...
 OCSERV=${srcdir}/fake-cisco-server.py
 launch_simple_sr_server --enable-multicert --cafile $CAFILE $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating using multiple certificate authentication... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --cafile $CAFILE \

diff --git a/tests/f5-auth-and-config b/tests/f5-auth-and-config
index 5a6c4eccd7ce0e2c7e265e6b4a712473f6fbe88f..11a33d58862af25873a171ff69739ac0ac03ff3e 100755 (executable)
--- a/tests/f5-auth-and-config
+++ b/tests/f5-auth-and-config
@@ -33,7 +33,7 @@ echo "Testing F5 auth against fake server ..."
 OCSERV=${srcdir}/fake-f5-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating with username/password in the absence of an HTML login form... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=f5 -q $ADDRESS:443/?no_html_login_form=1 -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||

diff --git a/tests/fortinet-auth-and-config b/tests/fortinet-auth-and-config
index f5fc016966c78e79d0043153515efa0314a4b99d..757b0596bb01eb82b8566388116f52ca13c87e39 100755 (executable)
--- a/tests/fortinet-auth-and-config
+++ b/tests/fortinet-auth-and-config
@@ -33,7 +33,7 @@ echo "Testing Fortinet auth against fake server ..."
 OCSERV=${srcdir}/fake-fortinet-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating with username/password and DEFAULT realm... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=fortinet -q $ADDRESS:443 -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||

diff --git a/tests/gp-auth-and-config b/tests/gp-auth-and-config
index babc5ae3e318c9b1974031fc079ce9a5d517dc52..c82c25c898a2f49fde3d6be7f980ffc4915abc45 100755 (executable)
--- a/tests/gp-auth-and-config
+++ b/tests/gp-auth-and-config
@@ -33,7 +33,7 @@ echo "Testing GlobalProtect auth against fake server ..."
 OCSERV=${srcdir}/fake-gp-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY >/dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating with username/password via portal... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=gp -q $ADDRESS:443/portal -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||

diff --git a/tests/juniper-auth b/tests/juniper-auth
index 32367074b03eb8c859976fa505610f56a05c458e..2edd64579d052db0cd64150238b420f606765c9b 100755 (executable)
--- a/tests/juniper-auth
+++ b/tests/juniper-auth
@@ -34,7 +34,7 @@ echo "Testing Juniper auth against fake server ..."
 OCSERV=${srcdir}/fake-juniper-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "frmLogin with username/password"
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=nc -q $ADDRESS:443 -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||

diff --git a/tests/juniper-sso-auth b/tests/juniper-sso-auth
index 795b9824e14148128c04734e9a6a60ad5e1c71f2..10eda8eda86efe09cab9b5c03b497d2a2e5427a8 100755 (executable)
--- a/tests/juniper-sso-auth
+++ b/tests/juniper-sso-auth
@@ -33,7 +33,7 @@ echo "Testing Juniper SSO auth against fake server ..."
 
 ${srcdir}/fake-juniper-sso-server.py $ADDRESS 1443 $CERT $KEY >/dev/null 2>&1 &
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Azure SSO with MFA. "
 (